From 0ae750341e380f8bebd589d1348c17586fb03398 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Jan 2004 11:59:55 +0000
Subject: * 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
---
 ChangeLog | 5 +++++
 dir.c     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1977768d7a..05e3d2d196 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 9c1b30027f..1086658f0d 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
 	    }
 
-- 
cgit v1.2.3