yugui	2010-11-02 00:01:51 +0900 (Tue, 02 Nov 2010)

  New Revision: 29659

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29659

  Log:
    merges r29181 from trunk into ruby_1_9_2.
    --
    * file.c (rb_file_s_readlink): symlink target should be in
      filesystem encoding.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/file.c
    branches/ruby_1_9_2/test/ruby/test_file_exhaustive.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29658)
+++ ruby_1_9_2/ChangeLog	(revision 29659)
@@ -1,3 +1,8 @@
+Sat Sep  4 23:48:47 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_s_readlink): symlink target should be in
+	  filesystem encoding.
+
 Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@r...>
 
 	* enum.c (enum_zip): fix typo of rdoc.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29658)
+++ ruby_1_9_2/version.h	(revision 29659)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 29
+#define RUBY_PATCHLEVEL 30
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 23
-#define RUBY_RELEASE_DATE "2010-10-23"
+#define RUBY_RELEASE_MONTH 11
+#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DATE "2010-11-01"
 
 #include "ruby/version.h"
 
Index: ruby_1_9_2/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_file_exhaustive.rb	(revision 29658)
+++ ruby_1_9_2/test/ruby/test_file_exhaustive.rb	(revision 29659)
@@ -354,11 +354,14 @@
     assert_raise(Errno::EEXIST) { File.link(@file, @file) }
   end
 
-  def test_symlink2
+  def test_readlink
     return unless @symlinkfile
     assert_equal(@file, File.readlink(@symlinkfile))
     assert_raise(Errno::EINVAL) { File.readlink(@file) }
     assert_raise(Errno::ENOENT) { File.readlink(@nofile) }
+    if fs = Encoding.find("filesystem")
+      assert_equal(fs, File.readlink(@symlinkfile).encoding)
+    end
   rescue NotImplementedError
   end
 
Index: ruby_1_9_2/file.c
===================================================================
--- ruby_1_9_2/file.c	(revision 29658)
+++ ruby_1_9_2/file.c	(revision 29659)
@@ -2446,7 +2446,7 @@
 	xfree(buf);
 	rb_sys_fail_path(path);
     }
-    v = rb_tainted_str_new(buf, rv);
+    v = rb_filesystem_str_new(buf, rv);
     xfree(buf);
 
     return v;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/