diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-21 05:45:48 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-21 05:45:48 +0000 |
commit | 07ae16d18cd08c77b163f23d8fd4ffe52b1cc769 (patch) | |
tree | 96a0ba328d434776e87c230f4f73db00f628d596 /file.c | |
parent | 0089bfe4ddf38e517e8e76cc3f721ed53c66d76d (diff) | |
download | ruby-07ae16d18cd08c77b163f23d8fd4ffe52b1cc769.tar.gz |
* file.c (file_path_convert): delay getting UTF8-MAC encoding
while really needed. [ruby-core:26807]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -106,26 +106,27 @@ VALUE rb_cStat; VALUE file_path_convert(VALUE name) { +#ifndef _WIN32 /* non Windows == Unix */ rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name)); rb_encoding *fs_encoding; -#ifdef __APPLE__ - static rb_encoding *utf8mac_encoding; - if (!utf8mac_encoding) - utf8mac_encoding = rb_enc_find("UTF8-MAC"); +# ifdef __APPLE__ + /* 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 - && utf8mac_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); } -#elif !defined(_WIN32) +# else /* Unix other than Mac OS X */ if (rb_default_internal_encoding() != NULL && rb_usascii_encoding() != fname_encoding && rb_ascii8bit_encoding() != fname_encoding && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) { + /* Don't call rb_filesystem_encoding() before US-ASCII and ASCII-8BIT */ name = rb_str_conv_enc(name, fname_encoding, fs_encoding); } +# endif #endif return name; } |