diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-18 06:28:19 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-18 06:28:19 +0000 |
| commit | ca0c0644b6569a251dac6b59415676749f64347b (patch) | |
| tree | 8a6dadaf1d4241ec6cf36106d0d1d788b0694ec8 /file.c | |
| parent | 009962410071606e23ec1861605b311dadd5085f (diff) | |
| download | ruby-ca0c0644b6569a251dac6b59415676749f64347b.tar.gz ruby-ca0c0644b6569a251dac6b59415676749f64347b.tar.xz ruby-ca0c0644b6569a251dac6b59415676749f64347b.zip | |
* 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
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |