From c466dcc05bd9b95717dba424be9535e2e75822bc Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 May 2014 02:02:51 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 ++++- dir.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 360b5a1419..d5419d508c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Sat May 17 10:40:33 2014 Nobuyoshi Nakada +Sat May 17 11:02:49 2014 Nobuyoshi Nakada + + * 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 064609c8d8..c7bddf4de2 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;