* file.c (DOSISH): better Cygwin support.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Jul 23, 2003 · 528b6c3 · 528b6c3
1 parent e96641b
commit 528b6c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 23 23:06:59 2003  WATANABE Hirofumi  <[email protected]>
+
+	* file.c (DOSISH): better Cygwin support.
+
 Wed Jul 23 18:43:00 2003  Masatoshi SEKI  <[email protected]>
 
 	* lib/erb.rb: import erb-2.0.4b1.

diff --git a/file.c b/file.c
@@ -1549,7 +1549,7 @@ file_expand_path(fname, dname, result)
 	    }
 	    BUFCHECK(strlen(dir) > buflen);
 	    strcpy(buf, dir);
-#ifdef DOSISH
+#if defined DOSISH || defined __CYGWIN__
 	    for (p = buf; *p; p = CharNext(p)) {
 		if (*p == '\\') {
 		    *p = '/';
@@ -1629,7 +1629,7 @@ file_expand_path(fname, dname, result)
 	    strcpy(buf, dir);
 	    free(dir);
 	}
-#ifdef DOSISH
+#if defined DOSISH || defined __CYGWIN__
 	if (isdirsep(*s)) {
 	    /* specified full path, but not drive letter nor UNC */
 	    /* we need to get the drive letter or UNC share name */
@@ -1677,7 +1677,7 @@ file_expand_path(fname, dname, result)
 		    }
 		    break;
 		  case '/':
-#if defined DOSISH
+#if defined DOSISH || defined __CYGWIN__
 		  case '\\':
 #endif
 		    b = ++s;
@@ -1689,7 +1689,7 @@ file_expand_path(fname, dname, result)
 	    }
 	    break;
 	  case '/':
-#if defined DOSISH
+#if defined DOSISH || defined __CYGWIN__
 	  case '\\':
 #endif
 	    if (s > b) {