From b18b4423c9f21f06bfdc13c2430582722981338e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Jan 2003 23:28:47 +0000
Subject: [PATCH] * file.c (rb_file_s_expand_path): removed a sludge.

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

diff --git a/ChangeLog b/ChangeLog
index 9e8e4a1f38..8b0e922e6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 30 08:27:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (rb_file_s_expand_path): removed a sludge.
+
 Tue Jan 28 04:45:03 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Prepend a
diff --git a/file.c b/file.c
index 257a086aad..eb6d2e01ef 100644
--- a/file.c
+++ b/file.c
@@ -1464,12 +1464,15 @@ rb_file_s_expand_path(argc, argv)
 	    }
 	    BUFCHECK(strlen(dir) > buflen);
 	    strcpy(buf, dir);
-	    for (p = buf; p < buf + strlen(dir); p = CharNext(p)) {
-		if (isdirsep(*p)) {
+#ifdef DOSISH
+	    for (p = buf; *p; p = CharNext(p)) {
+		if (*p == '\\') {
 		    *p = '/';
 		}
 	    }
+#else
 	    p = buf + strlen(dir);
+#endif
 	    s++;
 	    tainted = 1;
 	}