nobu	2013-07-26 17:49:31 +0900 (Fri, 26 Jul 2013)

  New Revision: 42190

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

  Log:
    win32/file.c: fix target encoding
    
    * win32/file.c (fix_string_encoding): fix target encoding.  the
      parameter `encoding' is not the target encoding but the original
      encoding.

  Modified files:
    trunk/ChangeLog
    trunk/win32/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42189)
+++ ChangeLog	(revision 42190)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jul 26 17:49:26 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/file.c (fix_string_encoding): fix target encoding.  the
+	  parameter `encoding' is not the target encoding but the original
+	  encoding.
+
 Fri Jul 26 14:05:19 2013  Zachary Scott  <e@z...>
 
 	* ext/fiddle/*: [DOC] More doc on dlopen and RTLD_DEFAULT from r42184
Index: win32/file.c
===================================================================
--- win32/file.c	(revision 42189)
+++ win32/file.c	(revision 42190)
@@ -235,7 +235,7 @@ code_page(rb_encoding *enc) https://github.com/ruby/ruby/blob/trunk/win32/file.c#L235
     return INVALID_CODE_PAGE;
 }
 
-#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), NULL, (encoding))
+#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), (encoding), rb_utf8_encoding())
 
 /*
   Replace the last part of the path to long name.

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