1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* dir.c (bracket): if same in bytes, path is matching.

Browse Source 
[ruby-dev:38305]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-14 09:11:29 +00:00
parent 946fe69932
commit 205c4b490c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Mon Apr 13 17:21:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): scan coderange incrementally. * sprintf.c (rb_str_format): scan coderange incrementally.

7
dir.c
View File

@ -109,7 +109,7 @@ bracket(
t1++; t1++;
if (!*t1) if (!*t1)
return NULL; return NULL;
p += (r = rb_enc_mbclen(p, pend, enc)); p += (r = rb_enc_mbclen(t1, pend, enc));
if (p[0] == '-' && p[1] != ']') { if (p[0] == '-' && p[1] != ']') {
const char *t2 = p + 1; const char *t2 = p + 1;
int r2; int r2;
@ -135,7 +135,10 @@ bracket(
} }
else { else {
if (ok) continue; 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; if (!nocase) continue;
c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc); c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc); c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #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_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 13 #define RUBY_RELEASE_DAY 14
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];