summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-17 02:02:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-17 02:02:51 +0000
commitc466dcc05bd9b95717dba424be9535e2e75822bc (patch)
tree7794c0f7f02c26c25dadda5c6cfa2e1beeabc046
parentf88481740a8f633ea02067baa00eaf94a29421fb (diff)
dir.c: try match PLAIN
* dir.c (glob_helper): try match PLAIN as well as ALPHA, which are separated by previous commits. [ruby-core:61552] [Bug #9648] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dir.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 360b5a14199..d5419d508c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sat May 17 10:40:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 17 11:02:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_helper): try match PLAIN as well as ALPHA, which are
+ separated by previous commits. [ruby-core:61552] [Bug #9648]
* dir.c (glob_make_pattern): set PLAIN for non-magical path to
skip parts which not need to glob.
diff --git a/dir.c b/dir.c
index 064609c8d81..c7bddf4de2c 100644
--- a/dir.c
+++ b/dir.c
@@ -1508,6 +1508,7 @@ glob_helper(
break;
}
# endif
+ case PLAIN:
case MAGICAL:
if (fnmatch(p->str, enc, name, flags) == 0)
*new_end++ = p->next;