diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dir.c | 16 | ||||
-rw-r--r-- | test/ruby/test_dir.rb | 3 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 23 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Feb 10 00:02:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dir.c (glob_helper): don't skip current directories if FNM_DOTMATCH + is given. [ruby-core:53108] [Bug #8006] + Wed Feb 5 23:39:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (intern_str): sigil only names are junk, at least one @@ -1388,11 +1388,19 @@ glob_helper( while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) { char *buf; enum answer new_isdir = UNKNOWN; + int dotfile = 0; if (recursive && dp->d_name[0] == '.') { - /* 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; + ++dotfile; + if (!dp->d_name[1]) { + /* unless DOTMATCH, skip current directories not to recurse infinitely */ + if (!(flags & FNM_DOTMATCH)) continue; + ++dotfile; + } + else if (dp->d_name[1] == '.' && !dp->d_name[2]) { + /* always skip parent directories not to recurse infinitely */ + continue; + } } buf = join_path(path, dirsep, dp->d_name, NAMLEN(dp)); @@ -1400,7 +1408,7 @@ glob_helper( status = -1; break; } - if (recursive && ((flags & FNM_DOTMATCH) || dp->d_name[0] != '.')) { + if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) { /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */ #ifndef _WIN32 if (do_lstat(buf, &st, flags) == 0) diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 1c8f73e20c..2ad6bdefcb 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -168,7 +168,10 @@ class TestDir < Test::Unit::TestCase def test_glob_recursive bug6977 = '[ruby-core:47418]' + bug8006 = '[ruby-core:53108] [Bug #8006]' Dir.chdir(@root) do + assert_include(Dir.glob("a/**/*", File::FNM_DOTMATCH), "a/.", bug8006) + FileUtils.mkdir_p("a/b/c/d/e/f") assert_equal(["a/b/c/d/e/f"], Dir.glob("a/**/e/f"), bug6977) assert_equal(["a/b/c/d/e/f"], Dir.glob("a/**/d/e/f"), bug6977) @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-02-05" -#define RUBY_PATCHLEVEL 396 +#define RUBY_RELEASE_DATE "2014-02-10" +#define RUBY_PATCHLEVEL 397 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h" |