usa	2012-11-10 01:50:39 +0900 (Sat, 10 Nov 2012)

  New Revision: 37605

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

  Log:
    * file.c (append_fspath): no need to do encoding trick here.

  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 37604)
+++ ruby_1_9_3/ChangeLog	(revision 37605)
@@ -1,3 +1,7 @@
+Sat Nov 10 01:25:52 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (append_fspath): no need to do encoding trick here.
+
 Sat Nov 10 00:37:02 2012  NAKAMURA Usaku  <usa@r...>
 
 	* siphash.h: check configure macros before include newer headers.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37604)
+++ ruby_1_9_3/version.h	(revision 37605)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 326
+#define RUBY_PATCHLEVEL 327
 
 #define RUBY_RELEASE_DATE "2012-11-10"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 37604)
+++ ruby_1_9_3/file.c	(revision 37605)
@@ -2874,14 +2874,7 @@
     VALUE dirname = Qnil;
     size_t dirlen = strlen(dir), buflen = rb_str_capacity(result);
 
-    if (*enc != fsenc) {
-	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);
-	}
-	*enc = direnc;
-    }
+    *enc = fsenc;
     do {buflen *= 2;} while (dirlen > buflen);
     rb_str_resize(result, buflen);
     buf = RSTRING_PTR(result);

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