* file.c (file_expand_path): drive letter is ascii only.

[ruby-dev:38612] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
cfis · Jun 17, 2009 · 7785612 · 7785612
1 parent 4d3c75e
commit 7785612
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 18 01:29:16 2009  Nobuyoshi Nakada  <[email protected]>
+
+	* file.c (file_expand_path): drive letter is ascii only.
+	  [ruby-dev:38612]
+
 Thu Jun 18 01:09:27 2009  Nobuyoshi Nakada  <[email protected]>
 
 	* configure.in (ridir, RI_BASE_NAME): fixed for path expansion.

diff --git a/file.c b/file.c
@@ -2745,6 +2745,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 	    memcpy(p, s, 2);
 	    p += 2;
 	    s += 2;
+	    rb_enc_associate_index(result, rb_usascii_encindex());
 	}
 	else {
 	    /* specified drive, but not full path */
-Original file line number
+Diff line change
@@ Expand Up @@
     	    memcpy(p, s, 2);
     	    p += 2;
     	    s += 2;
+    	    rb_enc_associate_index(result, rb_usascii_encindex());
     	}
     	else {
     	    /* specified drive, but not full path */
@@ Expand Down @@