usa	2012-10-26 17:22:31 +0900 (Fri, 26 Oct 2012)

  New Revision: 37334

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

  Log:
    merge revision(s) 34397: [Backport #6881]
    
    * file.c (append_fspath): need to set the encoding to result always.

  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 37333)
+++ ruby_1_9_3/ChangeLog	(revision 37334)
@@ -1,3 +1,7 @@
+Fri Oct 26 17:22:18 2012  NAKAMURA Usaku  <usa@r...>
+
+	* file.c (append_fspath): need to set the encoding to result always.
+
 Fri Oct 26 11:03:46 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (rb_enc_path_next, rb_enc_path_skip_prefix)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37333)
+++ ruby_1_9_3/version.h	(revision 37334)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 304
+#define RUBY_PATCHLEVEL 305
 
 #define RUBY_RELEASE_DATE "2012-10-26"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 37333)
+++ ruby_1_9_3/file.c	(revision 37334)
@@ -2881,7 +2881,6 @@
 	    RSTRING_GETMEM(dirname, cwdp, dirlen);
 	}
 	*enc = direnc;
-	rb_enc_associate(result, direnc);
     }
     do {buflen *= 2;} while (dirlen > buflen);
     rb_str_resize(result, buflen);
@@ -2889,6 +2888,7 @@
     memcpy(buf, cwdp, dirlen);
     xfree(dir);
     if (!NIL_P(dirname)) rb_str_resize(dirname, 0);
+    rb_enc_associate(result, *enc);
     return buf + dirlen;
 }
 

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