diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-18 02:41:25 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-18 02:41:25 +0000 |
commit | 6c2373ea6758040ecc2607395adad03f98d01308 (patch) | |
tree | bdf22d2884dbdd3de0d9a9c9288440e53230028d /io.c | |
parent | 20492556c90795de88a214fe64becb6f30ae568d (diff) | |
download | ruby-6c2373ea6758040ecc2607395adad03f98d01308.tar.gz |
* io.c (rb_scan_open_args): move path encoding conversion
for filesystem encoding of Mac OS X.
* file.c (file_path_convert): added for convert encoding
of file path.
* file.c (rb_get_path_check): add file_path_convert.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -5323,27 +5323,6 @@ rb_scan_open_args(int argc, VALUE *argv, opt = pop_last_hash(&argc, argv); rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm); FilePathValue(fname); -#ifdef __APPLE__ - { - static rb_encoding *fs_encoding; - static rb_encoding *utf8mac_encoding; - rb_encoding *fname_encoding = rb_enc_get(fname); - if (!fs_encoding) - fs_encoding = rb_filesystem_encoding(); - if (!utf8mac_encoding) - utf8mac_encoding = rb_enc_find("UTF8-MAC"); - if (rb_usascii_encoding() != fname_encoding - && rb_ascii8bit_encoding() != fname_encoding - && rb_utf8_encoding() != fname_encoding - && utf8mac_encoding != fname_encoding - && fs_encoding != fname_encoding) { - static VALUE fs_enc; - if (!fs_enc) - fs_enc = rb_enc_from_encoding(fs_encoding); - fname = rb_str_encode(fname, fs_enc, 0, Qnil); - } - } -#endif rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p); |