kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dir.c: normalize cwd

Browse source 
* dir.c (rb_dir_getwd): normalize OS path to UTF-8 on OS X.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-04 01:10:00 +00:00
parent 8bcf81886f
commit c604000a31
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Oct 4 10:09:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (rb_dir_getwd): normalize OS path to UTF-8 on OS X.
Sun Oct 4 00:09:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/ruby-runner.c.in: wrapper to set dynamic loading path

5
dir.c
View file

@ -1012,7 +1012,12 @@ rb_dir_getwd(void)
VALUE cwd;
path = my_getcwd();
#ifdef __APPLE__
cwd = rb_str_normalize_ospath(path, strlen(path));
OBJ_TAINT(cwd);
#else
cwd = rb_tainted_str_new2(path);
#endif
rb_enc_associate(cwd, rb_filesystem_encoding());
xfree(path);

10
test/ruby/test_dir_m17n.rb
View file

@ -395,4 +395,14 @@ class TestDir_M17N < Test::Unit::TestCase
pp.assert_equal(orig, ents, bug7267)
}
end
def test_pwd
with_tmpdir {|d|
orig = %W"d\u{e9}tente x\u{304c 304e 3050 3052 3054}"
orig.each do |n|
Dir.mkdir(n)
assert_equal(n, File.basename(Dir.chdir(n) {Dir.pwd}))
end
}
end
end