0
@@ -1,3 +1,8 @@
0
+Fri Jul 25 00:10:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
0
+
0
+	* file.c (rb_find_file_ext, rb_find_file): converts Windows style path
0
+	  to Cygwin path.  [ruby-dev:35647]
0
+
0
 Thu Jul 24 16:30:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
0
 
0
   * win32/win32.c (exit_handler): use st_free_table() to free socklist.

0
@@ -4447,6 +4447,25 @@ file_load_ok(const char *path)
0
     return eaccess(path, R_OK) == 0;
0
 }
0
 
0
+#ifdef __CYGWIN__
0
+static void
0
+intern_cygwin_path(volatile VALUE *path)
0
+{
0
+    char rubylib[MAXPATHLEN];
0
+    VALUE str = *path;
0
+    const char *p = RSTRING_PTR(str);
0
+
0
+    if (*p == '\\' || has_drive_letter(p)) {
0
+	if (cygwin_conv_to_posix_path(p, rubylib) == 0) {
0
+	    *path = rb_str_new2(rubylib);
0
+	}
0
+    }
0
+}
0
+#define intern_path(str) intern_cygwin_path(&(str))
0
+#else
0
+#define intern_path(str) (void)(str)
0
+#endif
0
+
0
 VALUE rb_get_load_path(void);
0
 
0
 int
0
@@ -4493,6 +4512,7 @@ rb_find_file_ext(VALUE *filep, const char *const *ext)
0
 
0
       FilePathValue(str);
0
       if (RSTRING_LEN(str) == 0) continue;
0
+	    intern_path(str);
0
       path = RSTRING_PTR(str);
0
       found = dln_find_file_r(StringValueCStr(fname), path, fbuf, sizeof(fbuf));
0
       if (found && file_load_ok(found)) {
0
@@ -4551,6 +4571,7 @@ rb_find_file(VALUE path)
0
       VALUE str = RARRAY_PTR(load_path)[i];
0
       FilePathValue(str);
0
       if (RSTRING_LEN(str) > 0) {
0
+		intern_path(str);
0
     rb_ary_push(tmp, str);
0
       }
0
   }