From ca0c0644b6569a251dac6b59415676749f64347b Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Nov 2009 06:28:19 +0000 Subject: * file.c (file_path_convert): delay getting filesystem encoding while really needed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 048dc7e53..552a35030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 18 15:27:20 2009 NAKAMURA Usaku + + * file.c (file_path_convert): delay getting filesystem encoding + while really needed. + Wed Nov 18 12:33:42 2009 NARUSE, Yui * encoding.c (enc_set_default_encoding): reset filesytem diff --git a/file.c b/file.c index 314ba8295..6d893316b 100644 --- a/file.c +++ b/file.c @@ -107,7 +107,7 @@ VALUE file_path_convert(VALUE name) { rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name)); - rb_encoding *fs_encoding = rb_filesystem_encoding(); + rb_encoding *fs_encoding; #ifdef __APPLE__ static rb_encoding *utf8mac_encoding; if (!utf8mac_encoding) @@ -116,14 +116,14 @@ file_path_convert(VALUE name) && rb_ascii8bit_encoding() != fname_encoding && rb_utf8_encoding() != fname_encoding && utf8mac_encoding != fname_encoding - && fs_encoding != fname_encoding) { + && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) { name = rb_str_conv_enc(name, fname_encoding, fs_encoding); } #elif !defined(_WIN32) if (rb_default_internal_encoding() != NULL && rb_usascii_encoding() != fname_encoding && rb_ascii8bit_encoding() != fname_encoding - && fs_encoding != fname_encoding) { + && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) { name = rb_str_conv_enc(name, fname_encoding, fs_encoding); } #endif -- cgit