From 0f3e58e707257f7456fd9be26ff27a973c722bce Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 8 Jan 2004 09:25:32 +0000 Subject: [PATCH] * dir.c (glob_helper): should not recurse in exceptional status. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ dir.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6657710854..42ab50011c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 8 18:25:29 2004 Nobuyoshi Nakada + + * dir.c (glob_helper): should not recurse in exceptional status. + Thu Jan 8 16:51:04 2004 NAKAMURA, Hiroshi * test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which diff --git a/dir.c b/dir.c index d084d18a86..84b0d21dde 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); }