naruse	2009-11-24 10:20:18 +0900 (Tue, 24 Nov 2009)

  New Revision: 25897

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

  Log:
    * file.c (file_path_convert): fix fs_encoding is not assign.

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25896)
+++ ChangeLog	(revision 25897)
@@ -1,3 +1,7 @@
+Tue Nov 24 10:17:38 2009  NARUSE, Yui  <naruse@r...>
+
+	* file.c (file_path_convert): fix fs_encoding is not assign.
+
 Tue Nov 24 10:00:00 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* error.c (rb_strerrno): constified.
Index: file.c
===================================================================
--- file.c	(revision 25896)
+++ file.c	(revision 25897)
@@ -103,7 +103,7 @@
 
 #define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
 
-VALUE
+static VALUE
 file_path_convert(VALUE name)
 {
 #ifndef _WIN32 /* non Windows == Unix */
@@ -113,7 +113,7 @@
     /* Mac OS X's file system encoding is UTF-8 */
     if (rb_usascii_encoding() != fname_encoding
 	    && rb_ascii8bit_encoding() != fname_encoding
-	    && rb_utf8_encoding() != fname_encoding
+	    && (fs_encoding = rb_filesystem_encoding()) != fname_encoding
 	    && rb_enc_find("UTF8-MAC") != fname_encoding) {
 	/* Don't call rb_enc_find() before UTF-8 */
 	name = rb_str_conv_enc(name, fname_encoding, fs_encoding);

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