summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-04 12:30:43 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-04 12:30:43 +0000
commit90c2b67432ef8380b8a0b238be508f9ad1dbd0ed (patch)
tree8bbfc66657921e36a2c5d39b9e2f9407fbb1bfb8 /dir.c
parent5e263fa0c0db7deedeef9ba6d991f9950c47e416 (diff)
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
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
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;