diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-12 05:56:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-12 05:56:53 +0000 |
commit | a860431e3b2a62401b2daef2efb4fe6924213afe (patch) | |
tree | 0ab3884a36c8c779d8cdffd9af9f51e6546c1dfd | |
parent | 7915aed8752566f355ab4b19216da96836fd9589 (diff) | |
download | ruby-a860431e3b2a62401b2daef2efb4fe6924213afe.tar.gz |
* file.c (file_expand_path): associate the input encoding when
copying an absolute path. [ruby-dev:38594]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Jun 12 14:56:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (file_expand_path): associate the input encoding when + copying an absolute path. [ruby-dev:38594] + Fri Jun 12 02:41:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (str_replace_shared): shared target must be frozen. @@ -2793,6 +2793,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) p = buf + (s - b); BUFCHECK(bdiff >= buflen); memset(buf, '/', p - buf); + rb_enc_copy(result, fname); } if (p > buf && p[-1] == '/') --p; |