diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-06 17:11:28 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-06 17:11:28 +0000 |
commit | 8a144fdedc2df7ee87e21ad805fcbcbd18209533 (patch) | |
tree | 17dedbc3d681f3eb19c0bcda6616cc4274e7cc94 /file.c | |
parent | f6a23214da3a22284707a5a6eaa52c3b6e7d60aa (diff) | |
download | ruby-8a144fdedc2df7ee87e21ad805fcbcbd18209533.tar.gz |
* encoding.c (enc_set_filesystem_encoding):
filesystem encoding on Mac OS X is now
default external encoding. so Mac OS X is now
treated as one of Unix. [ruby-dev:40439]
* file.c (file_path_convert): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -109,16 +109,6 @@ 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__ - /* Mac OS X's file system encoding is UTF-8 */ - if (rb_usascii_encoding() != fname_encoding - && rb_ascii8bit_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); - } -# else /* Unix other than Mac OS X */ if (rb_default_internal_encoding() != NULL && rb_usascii_encoding() != fname_encoding && rb_ascii8bit_encoding() != fname_encoding @@ -126,7 +116,6 @@ file_path_convert(VALUE name) /* 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; } |