yugui	2010-06-11 01:46:28 +0900 (Fri, 11 Jun 2010)

  New Revision: 28268

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

  Log:
    merges r28105 from trunk into ruby_1_9_2.
    --
    * file.c (file_expand_path): Refix r28102: this breaks
      r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/file.c
    branches/ruby_1_9_2/test/ruby/test_path.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28267)
+++ ruby_1_9_2/ChangeLog	(revision 28268)
@@ -1,3 +1,8 @@
+Mon May 31 15:07:18 2010  NARUSE, Yui  <naruse@r...>
+
+	* file.c (file_expand_path): Refix r28102: this breaks
+	  r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]
+
 Mon May 31 02:17:54 2010  Yukihiro Matsumoto  <matz@r...>
 
 	* insns.def (defined): respond_to_missing? may not be available
Index: ruby_1_9_2/test/ruby/test_path.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_path.rb	(revision 28267)
+++ ruby_1_9_2/test/ruby/test_path.rb	(revision 28268)
@@ -42,6 +42,8 @@
     end
     assert_equal("//", File.expand_path(".", "//"))
     assert_equal("//sub", File.expand_path("sub", "//"))
+
+    assert_equal("/tmp/\u3042", File.expand_path("\u3042", "/tmp"))
   end
 
   def test_dirname
Index: ruby_1_9_2/file.c
===================================================================
--- ruby_1_9_2/file.c	(revision 28267)
+++ ruby_1_9_2/file.c	(revision 28268)
@@ -2887,7 +2887,8 @@
 		xfree(dir);
 		rb_enc_associate_index(result, rb_filesystem_encindex());
 	    }
-	    else rb_enc_check(result, fname);
+	    else
+		rb_enc_associate(result, rb_enc_check(result, fname));
 	    p = chompdirsep(skiproot(buf));
 	    s += 2;
 	}
@@ -2897,7 +2898,7 @@
 	if (!NIL_P(dname)) {
 	    file_expand_path(dname, Qnil, abs_mode, result);
 	    BUFINIT();
-	    rb_enc_check(result, fname);
+	    rb_enc_associate(result, rb_enc_check(result, fname));
 	}
 	else {
 	    char *dir = my_getcwd();

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