1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* file.c (file_expand_path): Refix r28102: this breaks

Browse Source 
r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-05-31 08:47:08 +00:00
parent d16fc7ca69
commit 455554b64c
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 31 15:07:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (file_expand_path): Refix r28102: this breaks
r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]
Mon May 31 14:47:09 2010 NARUSE, Yui <naruse@ruby-lang.org> Mon May 31 14:47:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_inspect): inspect as ASCII when the codepoint * string.c (rb_str_inspect): inspect as ASCII when the codepoint

5
file.c
View File

@ -2887,7 +2887,8 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
xfree(dir); xfree(dir);
rb_enc_associate_index(result, rb_filesystem_encindex()); rb_enc_associate_index(result, rb_filesystem_encindex());
} }
else rb_enc_check(result, fname); else
rb_enc_associate(result, rb_enc_check(result, fname));
p = chompdirsep(skiproot(buf)); p = chompdirsep(skiproot(buf));
s += 2; s += 2;
} }
@ -2897,7 +2898,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
if (!NIL_P(dname)) { if (!NIL_P(dname)) {
file_expand_path(dname, Qnil, abs_mode, result); file_expand_path(dname, Qnil, abs_mode, result);
BUFINIT(); BUFINIT();
rb_enc_check(result, fname); rb_enc_associate(result, rb_enc_check(result, fname));
} }
else { else {
char *dir = my_getcwd(); char *dir = my_getcwd();

2
test/ruby/test_path.rb
View File

@ -42,6 +42,8 @@ class TestPath < Test::Unit::TestCase
end end
assert_equal("//", File.expand_path(".", "//")) assert_equal("//", File.expand_path(".", "//"))
assert_equal("//sub", File.expand_path("sub", "//")) assert_equal("//sub", File.expand_path("sub", "//"))
assert_equal("/tmp/\u3042", File.expand_path("\u3042", "/tmp"))
end end
def test_dirname def test_dirname