diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:14:14 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:14:14 +0000 |
| commit | 003486341d21990b25edbedfbf46fceeea1e12b4 (patch) | |
| tree | 9b79d3f0315ba647bab513ed134436411b32ca8a /lib | |
| parent | db54a65ffc92344b8aee30f4a59d3da37bfccd22 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tmpdir.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index bcd66ab424..28b15d651c 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -28,6 +28,7 @@ class Dir len = getdir.call(windir, windir.size) windir = File.expand_path(windir[0, len]) end + windir.force_encoding(Dir.pwd.encoding) temp = File.join(windir.untaint, 'temp') @@systmpdir = temp if File.directory?(temp) and File.writable?(temp) rescue LoadError |