From 003486341d21990b25edbedfbf46fceeea1e12b4 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 09:14:14 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ dir.c | 1 + lib/tmpdir.rb | 1 + version.h | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e4ae5afbdd..a1b4bf4edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 10 18:15:17 2009 NAKAMURA Usaku + + * dir.c (dir_s_getwd): directory path's encoding should be filesystem's + one. + + * lib/tmpdir.rb: ditto (but not finished yet.) + Tue Jun 9 22:38:09 2009 Tadayoshi Funaba * lib/cmath.rb (log10): raised exception when the given number is diff --git a/dir.c b/dir.c index 5a46f1bfc2..a79d8e5b20 100644 --- a/dir.c +++ b/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; 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 diff --git a/version.h b/version.h index 4ce732b555..249ec13506 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 171 +#define RUBY_PATCHLEVEL 172 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1