From c391e4b81b1a1be5303bda8900bf4e01cd10fd8d Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 4 May 2009 12:30:43 +0000 Subject: merges r23194 from trunk into ruby_1_9_1. -- * dir.c (bracket): fix escape handling for range character in bracket of fnmatch pattern. e.g., '[a\-c]' should not match 'b'. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dir.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 17a1d56d6..c62d2458d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 17 00:45:09 2009 Yusuke Endoh + + * dir.c (bracket): fix escape handling for range character in bracket + of fnmatch pattern. e.g., '[a\-c]' should not match 'b'. + Wed Apr 15 11:53:35 2009 NARUSE, Yui * dir.c (fnmatch_helper): use rb_enc_precise_mbclen and diff --git a/dir.c b/dir.c index f27f04c40..4754b75ae 100644 --- a/dir.c +++ b/dir.c @@ -109,7 +109,7 @@ bracket( t1++; if (!*t1) return NULL; - p += (r = rb_enc_mbclen(t1, pend, enc)); + p = t1 + (r = rb_enc_mbclen(t1, pend, enc)); if (p[0] == '-' && p[1] != ']') { const char *t2 = p + 1; int r2; -- cgit