ruby-changes:12110
From: yugui <ko1@a...>
Date: Sun, 21 Jun 2009 18:14:33 +0900 (JST)
Subject: [ruby-changes:12110] Ruby:r23781 (ruby_1_9_1): merges r23661 from trunk into ruby_1_9_1.
yugui 2009-06-21 18:14:14 +0900 (Sun, 21 Jun 2009) New Revision: 23781 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23781 Log: 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.) Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/dir.c branches/ruby_1_9_1/lib/tmpdir.rb branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23780) +++ ruby_1_9_1/ChangeLog (revision 23781) @@ -1,3 +1,10 @@ +Wed Jun 10 18:15:17 2009 NAKAMURA Usaku <usa@r...> + + * 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 <tadf@d...> * lib/cmath.rb (log10): raised exception when the given number is Index: ruby_1_9_1/lib/tmpdir.rb =================================================================== --- ruby_1_9_1/lib/tmpdir.rb (revision 23780) +++ ruby_1_9_1/lib/tmpdir.rb (revision 23781) @@ -28,6 +28,7 @@ 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 Index: ruby_1_9_1/dir.c =================================================================== --- ruby_1_9_1/dir.c (revision 23780) +++ ruby_1_9_1/dir.c (revision 23781) @@ -802,6 +802,7 @@ rb_secure(4); path = my_getcwd(); cwd = rb_tainted_str_new2(path); + rb_enc_associate(cwd, rb_filesystem_encoding()); xfree(path); return cwd; Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 23780) +++ ruby_1_9_1/version.h (revision 23781) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/