mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 18:13:58 +02:00
merges r23661 from trunk into ruby_1_9_1.
-- * dir.c (dir_s_getwd): directory path's encoding should be filesystem's one. * lib/tmpdir.rb: ditto (but not finished yet.) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
db54a65ffc
commit
003486341d
4 changed files with 10 additions and 1 deletions
1
dir.c
1
dir.c
|
@ -802,6 +802,7 @@ dir_s_getwd(VALUE dir)
|
|||
rb_secure(4);
|
||||
path = my_getcwd();
|
||||
cwd = rb_tainted_str_new2(path);
|
||||
rb_enc_associate(cwd, rb_filesystem_encoding());
|
||||
|
||||
xfree(path);
|
||||
return cwd;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue