From 34a78f5670c1453005e1b8c9c7b0095d9594c6ac Mon Sep 17 00:00:00 2001 From: ocean Date: Tue, 24 Feb 2004 10:03:08 +0000 Subject: * 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/branches/ruby_1_8@5825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dir.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index db6e45c12d..92e19c7556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 24 18:59:37 Hirokazu Yamamoto + + * dir.c (glob_helper): '**/' should not match leading period + unless File::FNM_DOTMATCH is set. (like '*/') + Tue Feb 24 13:22:21 2004 Dave Thomas * lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better diff --git a/dir.c b/dir.c index be537ca236..b26eda4c38 100644 --- a/dir.c +++ b/dir.c @@ -981,6 +981,8 @@ glob_helper(path, sub, flags, func, arg) if (recursive) { if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0) continue; + if (fnmatch("*", dp->d_name, flags) != 0) + continue; buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6); sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name); if (lstat(buf, &st) < 0) { -- cgit v1.2.3