usa	2012-01-30 12:31:58 +0900 (Mon, 30 Jan 2012)

  New Revision: 34397

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

  Log:
    * file.c (append_fspath): need to set the encoding to result always.

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34396)
+++ ChangeLog	(revision 34397)
@@ -1,3 +1,7 @@
+Mon Jan 30 12:31:05 2012  NAKAMURA Usaku  <usa@r...>
+
+	* file.c (append_fspath): need to set the encoding to result always.
+
 Mon Jan 30 10:38:37 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/irb/test_completion.rb: skip if cannot load irb/completion
Index: file.c
===================================================================
--- file.c	(revision 34396)
+++ file.c	(revision 34397)
@@ -2888,7 +2888,6 @@
 	    RSTRING_GETMEM(dirname, cwdp, dirlen);
 	}
 	*enc = direnc;
-	rb_enc_associate(result, direnc);
     }
     do {buflen *= 2;} while (dirlen > buflen);
     rb_str_resize(result, buflen);
@@ -2896,6 +2895,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/