diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-24 14:59:20 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-24 14:59:20 +0000 |
commit | fbbf715d275ea646d8ce46710895b094dd5f6a77 (patch) | |
tree | 2c08b60562ea1878920418374db48eaa52004e90 /dir.c | |
parent | ae6fb2c8f752e40d0ccbe1795adba4977adf804e (diff) |
revert r48975
caused CI fauilures
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -1439,7 +1439,6 @@ glob_helper( char *plainname = 0; # endif IF_HAVE_HFS(int hfs_p); - IF_HAVE_HFS(int alpha_matched = 0); # ifdef DOSISH if (cur + 1 == end && (*cur)->type <= ALPHA) { plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str)); @@ -1541,10 +1540,8 @@ glob_helper( # endif case PLAIN: case MAGICAL: - if (fnmatch(p->str, enc, name, flags) == 0) { - IF_HAVE_HFS(alpha_matched |= (p->type == ALPHA)); + if (fnmatch(p->str, enc, name, flags) == 0) *new_end++ = p->next; - } default: break; } @@ -1555,7 +1552,6 @@ glob_helper( GLOB_FREE(buf); GLOB_FREE(new_beg); if (status) break; - IF_HAVE_HFS(if (alpha_matched) break); } closedir(dirp); |