summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-17 16:29:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-17 16:29:22 +0000
commitd045f6eaf238d683f78ccafcc2769127c83542ce (patch)
treedebeb80080b8283a01ecc4213f3b9196161f9797
parentdf2adae120f8a11f090c0e4482fc736a06b6bd5c (diff)
downloadruby-d045f6eaf238d683f78ccafcc2769127c83542ce.tar.gz
ruby-d045f6eaf238d683f78ccafcc2769127c83542ce.tar.xz
ruby-d045f6eaf238d683f78ccafcc2769127c83542ce.zip
* file.c (file_expand_path): drive letter is ascii only.
[ruby-dev:38612] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 14b0601a9..a244e1c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 18 01:29:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): drive letter is ascii only.
+ [ruby-dev:38612]
+
Thu Jun 18 01:09:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ridir, RI_BASE_NAME): fixed for path expansion.
diff --git a/file.c b/file.c
index 41080ff23..0b1eef2a7 100644
--- 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 */