From 1655f6be28c425977bcb97e730d93bb430b77bfb Mon Sep 17 00:00:00 2001 From: ocean Date: Tue, 24 Feb 2004 09:49:59 +0000 Subject: * dir.c (glob_helper): '**/' should not match leading period unless File::FNM_DOTMATCH is set. (like '*/') git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index aa3a4b989..75f5cda5a 100644 --- a/dir.c +++ b/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; -- cgit