diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-20 14:40:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-20 14:40:53 +0000 |
| commit | 80ecaa17776de97d8f7d9c256830edb45917987a (patch) | |
| tree | d88ec0fbe5083628d38719678753d163ec2cc3e3 /dir.c | |
| parent | 62ff805f22bc23ddb4ba621588c43b97f902f546 (diff) | |
merge revision(s) 40345: [Backport #8283]
* dir.c (glob_helper): should skip dot directories only for recursion,
but should not if matching to the given pattern. [ruby-core:54387]
[Bug #8283]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1386,9 +1386,6 @@ glob_helper( enum answer new_isdir = UNKNOWN; if (recursive && dp->d_name[0] == '.') { - /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */ - if (!(flags & FNM_DOTMATCH)) continue; - /* always skip current and parent directories not to recurse infinitely */ if (!dp->d_name[1]) continue; if (dp->d_name[1] == '.' && !dp->d_name[2]) continue; @@ -1399,7 +1396,8 @@ glob_helper( status = -1; break; } - if (recursive) { + if (recursive && ((flags & FNM_DOTMATCH) || dp->d_name[0] != '.')) { + /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */ #ifndef _WIN32 if (do_lstat(buf, &st, flags) == 0) new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO; |