From 65ea437148169673823a09d4bf66d97a1187d8dd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 May 2002 01:53:48 +0000
Subject: [PATCH] * dir.c (glob_helper): remove escaping backslashes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 dir.c     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a8e42b023..f3e3a34e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 11 10:52:09 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (glob_helper): remove escaping backslashes.
+
 Fri May 10 19:00:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* parse.y (here_document): preserve line number begins here
diff --git a/dir.c b/dir.c
index 8ade5471c6..3df0c0c54a 100644
--- a/dir.c
+++ b/dir.c
@@ -637,7 +637,6 @@ static void
 remove_backslashes(p)
     char *p;
 {
-#if defined DOSISH
     char *pend = p + strlen(p);
     char *t = p;
 
@@ -648,7 +647,6 @@ remove_backslashes(p)
 	*t++ = *p++;
     }
     *t = '\0';
-#endif
 }
 
 #ifndef S_ISDIR
@@ -668,7 +666,11 @@ glob_helper(path, sub, flags, func, arg)
 
     p = sub ? sub : path;
     if (!has_magic(p, 0, flags)) {
+#if defined DOSISH
 	remove_backslashes(path);
+#else
+	if (!(flags & FNM_NOESCAPE)) remove_backslashes(p);
+#endif
 	if (stat(path, &st) == 0) {
 	    (*func)(path, arg);
 	}