зеркало из https://github.com/github/ruby.git
revert r48975
caused CI fauilures git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
ae6fb2c8f7
Коммит
fbbf715d27
6
dir.c
6
dir.c
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче