diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dir.c | 7 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 12 insertions, 4 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] + Mon Apr 13 17:21:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * sprintf.c (rb_str_format): scan coderange incrementally. @@ -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); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-04-13" +#define RUBY_RELEASE_DATE "2009-04-14" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |