aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-24 08:17:10 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-24 08:17:10 +0000
commit77d7ff7cbe2273457d3770ac9d267294afc8ef45 (patch)
tree4a6a184562cd8fa7ed2a7d8981395b7b832c3af6
parentd22ade523fbe9ebf4b4f8ca617385a538438554a (diff)
downloadruby-77d7ff7cbe2273457d3770ac9d267294afc8ef45.tar.gz
* dir.c (fnmatch): File.fnmatch with FNM_PATHNAME was broken
for the pattern including '*' followed by '/'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dir.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9649c231d2..0d18bc6240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 24 17:07:17 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * dir.c (fnmatch): File.fnmatch with FNM_PATHNAME was broken
+ for the pattern including '*' followed by '/'.
+
Tue Feb 24 13:22:21 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
diff --git a/dir.c b/dir.c
index 19d37dd876..aa3a4b989e 100644
--- a/dir.c
+++ b/dir.c
@@ -250,6 +250,7 @@ fnmatch(pat, string, flags)
s = rb_path_next(s);
if (*s) {
INC_S();
+ ++pat;
break;
}
return FNM_NOMATCH;