diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dir.c | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Apr 14 18:11:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dir.c (bracket): if same in bytes, path is matching. + [ruby-dev:38305] + Sun Apr 12 19:54:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (bracket, fnmatch_helper): compare bytewise first, to get @@ -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); |