diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-04 12:30:26 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-04 12:30:26 +0000 |
commit | 70f1666743b44b48b9de415839468f8aeac4607f (patch) | |
tree | d749ce25b1756311df8049b48217aa5775be1eea /dir.c | |
parent | 24345d4d595d93b79b5849be8e75d7dfcf3641b3 (diff) |
merges r23189 from trunk into ruby_1_9_1.
--
* dir.c (bracket): if same in bytes, path is matching.
[ruby-dev:38305]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -109,7 +109,7 @@ bracket( t1++; if (!*t1) return NULL; - p += (r = rb_enc_mbclen(p, pend, enc)); + p += (r = rb_enc_mbclen(t1, pend, enc)); if (p[0] == '-' && p[1] != ']') { const char *t2 = p + 1; int r2; @@ -135,7 +135,10 @@ bracket( } else { if (ok) continue; - if (r <= (send-s) && memcmp(p, s, r) == 0) continue; + if (r <= (send-s) && memcmp(t1, s, r) == 0) { + ok = 1; + continue; + } if (!nocase) continue; c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc); c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc); |