diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dir.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,8 @@ -Sat May 17 10:05:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat May 17 10:40:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dir.c (glob_make_pattern): set PLAIN for non-magical path to + skip parts which not need to glob. + [ruby-core:61552] [Bug #9648] * dir.c (has_magic): return ALPHA at alphabetical name regardless FNM_CASEFOLD flag. @@ -1229,7 +1229,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc) } memcpy(buf, p, m-p); buf[m-p] = '\0'; - tmp->type = magic > MAGICAL ? MAGICAL : magic; + tmp->type = magic > MAGICAL ? MAGICAL : magic > non_magic ? magic : PLAIN; tmp->str = buf; if (*m) { dirsep = 1; |