[ruby-dev:7427] Re: File#expand_path ignore drive letter on mswin32

わたなべです.

WATANABE Hirofumi <[e-mail]> writes:

::>mswin32でFile#expand_pathはドライブ指定を相対パスと
::>みなしてしまいますが……仕様？
::
::後で調べますが、バグでしょう。
:
:すっかり忘れてました.

対応しました.
(ただし File.expand_path("C:") のようなものは除く)

--- file.c.orig	Thu Jul 15 17:29:14 1999
+++ file.c	Tue Jul 27 01:20:40 1999
@@ -1047,2 +1047,12 @@
 
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__)
+#define DOSISH 1
+#endif
+
+#if defined DOSISH
+#define ispathsep(x) ((x) == '/' || (x) == '\\')
+#else
+#define ispathsep(x) ((x) == '/')
+#endif
+
 VALUE
@@ -1061,7 +1071,3 @@
     if (s[0] == '~') {
-	if (s[1] == '/' || 
-#if defined(MSDOS) || defined(NT) || defined(__human68k__)
-	    s[1] == '\\' || 
-#endif
-	    s[1] == '\0') {
+	if (ispathsep(s[1]) || s[1] == '\0') {
 	    char *dir = getenv("HOME");
@@ -1080,3 +1086,3 @@
 #endif
-	    while (*s && *s != '/') {
+	    while (*s && !ispathsep(*s)) {
 		*p++ = *s++;
@@ -1096,2 +1102,9 @@
     }
+#if defined DOSISH
+    else if (isalpha(s[0]) && s[1] == ':' && ispathsep(s[2])) {
+	while (*s && !ispathsep(*s)) {
+	    *p++ = *s++;
+	}
+    }
+#endif
     else if (s[0] != '/') {
@@ -1119,6 +1132,6 @@
 		  case '.':
-		    if (*(s+1) == '\0' || *(s+1) == '/') { 
+		    if (*(s+1) == '\0' || ispathsep(*(s+1))) { 
 			/* We must go back to the parent */
-			if (*p == '/' && p > buf) p--;
-			while (p > buf && *p != '/') p--;
+			if (ispathsep(*p) && p > buf) p--;
+			while (p > buf && !ispathsep(*p)) p--;
 		    }
@@ -1130,3 +1143,6 @@
 		  case '/':
-		    if (*p != '/') *++p = '/'; 
+#if defined DOSISH
+		  case '\\':
+#endif
+		    if (!ispathsep(*p)) *++p = '/'; 
 		    break;
@@ -1138,3 +1154,6 @@
 	  case '/':
-	    if (*p != '/') *++p = '/'; break;
+#if defined DOSISH
+	  case '\\':
+#endif
+	    if (!ispathsep(*p)) *++p = '/'; break;
 	  default:
@@ -1145,3 +1164,3 @@
     /* Place a \0 at end. If path ends with a "/", delete it */
-    if (p == buf || *p != '/') p++;
+    if (p == buf || !ispathsep(*p)) p++;
     *p = '\0';