summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-08 09:25:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-08 09:25:32 +0000
commit10bdf46e0a8b988a4757b69e498f1a6fda8b4142 (patch)
tree6c2becc3ce961fe0b55477c1ce45c0ed28278540
parenta0ba80f10cfa8a7d04b703e0cd50207935677dc3 (diff)
downloadruby-10bdf46e0a8b988a4757b69e498f1a6fda8b4142.tar.gz
ruby-10bdf46e0a8b988a4757b69e498f1a6fda8b4142.tar.xz
ruby-10bdf46e0a8b988a4757b69e498f1a6fda8b4142.zip
* dir.c (glob_helper): should not recurse in exceptional status.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 665771085..42ab50011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 8 18:25:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_helper): should not recurse in exceptional status.
+
Thu Jan 8 16:51:04 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
diff --git a/dir.c b/dir.c
index d084d18a8..84b0d21dd 100644
--- a/dir.c
+++ b/dir.c
@@ -1138,7 +1138,7 @@ glob_helper(path, sub, separator, flags, func, arg) /* if separator p[-1] is rem
free(tmp);
}
- if (!magical) {
+ if (status == 0 && !magical) {
status = glob_helper(path, p, separator, flags, func, arg);
}