* dir.c (glob_helper): '**/' should not match leading period

unless File::FNM_DOTMATCH is set. (like '*/')


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,10 +1,15 @@
+Tue Feb 24 18:42:03  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (glob_helper): '**/' should not match leading period 
+	  unless File::FNM_DOTMATCH is set. (like '*/')
+
 Tue Feb 24 18:03:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_file.rb (test_fnmatch): test for dir.c:1.108.
 
 Tue Feb 24 17:07:17  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* dir.c (fnmatch): File.fnmatch with FNM_PATHNAME was broken
+	* dir.c (fnmatch): File.fnmatch with File::FNM_PATHNAME was broken
 	  for the pattern including '*' followed by '/'.
 
 Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>

dir.c

@@ -1188,7 +1188,8 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    char *buf = join_path(path, dirsep, dp->d_name);
 
 	    enum answer new_isdir = UNKNOWN;
-	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0) {
+	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
+		&& fnmatch("*", dp->d_name, flags) == 0) {
 #ifndef _WIN32
 		if (do_lstat(buf, &st) == 0)
 		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;