summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-29 11:59:55 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-29 11:59:55 +0000
commit0ae750341e380f8bebd589d1348c17586fb03398 (patch)
treed6a4f6a6af85cf4d68777bdd91fa54285c8c2a23
parent784360a978ab51dbf6515d97abcc67465782ca5e (diff)
* dir.c (glob_helper): infinite loop bug in win32 code.
[ruby-dev:22770] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dir.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1977768d7a9..05e3d2d196e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Thu Jan 29 19:28:16 2004 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb (Request#initialize): reject only when a path is
empty. [ruby-dev:22771]
+Thu Jan 29 18:54:08 2004 H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
+
+ * dir.c (glob_helper): infinite loop bug in win32 code.
+ [ruby-dev:22770]
+
Thu Jan 29 17:03:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
diff --git a/dir.c b/dir.c
index 9c1b30027f1..1086658f0dd 100644
--- a/dir.c
+++ b/dir.c
@@ -1205,7 +1205,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
else
new_isdir = NO;
#else
- new_isdir = dp->d_isdir ? YES : dp->d_isrep ? UNKNOWN : NO;
+ new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
#endif
}