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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 17a1d56d60..c62d2458dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 17 00:45:09 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* 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  <naruse@ruby-lang.org>
 
 	* dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
diff --git a/dir.c b/dir.c
index f27f04c40a..4754b75aef 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;