From 6c2373ea6758040ecc2607395adad03f98d01308 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 18 Nov 2009 02:41:25 +0000 Subject: * 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 --- io.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index dc3a796587..21188eb17d 100644 --- a/io.c +++ b/io.c @@ -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); -- cgit v1.2.3