usa	2012-11-10 00:11:03 +0900 (Sat, 10 Nov 2012)

  New Revision: 37596

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

  Log:
    * file.c (append_fspath): revert a part of r37562.
    
    * file.c (rb_file_expand_path_internal): ditto.
    
    * file.c (rb_file_expand_path_internal): ignore the encoding of the
      given path name and use filesystem encoding, except when the result
      is 8bit range and the filesystem encoding is US-ASCII.
      [ruby-dev:39393] [Bug #2154]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/file.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37595)
+++ ruby_1_9_3/ChangeLog	(revision 37596)
@@ -1,3 +1,14 @@
+Fri Nov  9 16:17:09 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (append_fspath): revert a part of r37562.
+
+	* file.c (rb_file_expand_path_internal): ditto.
+
+	* file.c (rb_file_expand_path_internal): ignore the encoding of the
+	  given path name and use filesystem encoding, except when the result
+	  is 8bit range and the filesystem encoding is US-ASCII.
+	  [ruby-dev:39393] [Bug #2154]
+
 Fri Nov  9 16:15:50 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/csv/test_features.rb: add require for Tempfile.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37595)
+++ ruby_1_9_3/version.h	(revision 37596)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
 
-#define RUBY_RELEASE_DATE "2012-11-09"
+#define RUBY_RELEASE_DATE "2012-11-10"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 37595)
+++ ruby_1_9_3/file.c	(revision 37596)
@@ -2875,7 +2875,7 @@
     size_t dirlen = strlen(dir), buflen = rb_str_capacity(result);
 
     if (*enc != fsenc) {
-	rb_encoding *direnc = rb_enc_check(dirname = rb_enc_str_new(dir, dirlen, fsenc), fname);
+	rb_encoding *direnc = rb_enc_check(fname, dirname = rb_enc_str_new(dir, dirlen, fsenc));
 	if (direnc != fsenc) {
 	    dirname = rb_str_conv_enc(dirname, fsenc, direnc);
 	    RSTRING_GETMEM(dirname, cwdp, dirlen);
@@ -2980,7 +2980,7 @@
     else if (!rb_is_absolute_path(s)) {
 	if (!NIL_P(dname)) {
 	    rb_file_expand_path_internal(dname, Qnil, abs_mode, long_name, result);
-	    rb_enc_check(result, fname);
+	    rb_enc_associate(result, rb_enc_check(result, fname));
 	    BUFINIT();
 	    p = pend;
 	}
@@ -3009,7 +3009,7 @@
 	BUFCHECK(bdiff >= buflen);
 	memset(buf, '/', len);
 	rb_str_set_len(result, len);
-	rb_enc_check(result, fname);
+	rb_enc_associate(result, rb_enc_check(result, fname));
     }
     if (p > buf && p[-1] == '/')
 	--p;
@@ -3228,6 +3228,7 @@
 
     if (tainted) OBJ_TAINT(result);
     rb_str_set_len(result, p - buf);
+    rb_enc_check(fname, result);
     ENC_CODERANGE_CLEAR(result);
     return result;
 }

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