diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 02:56:23 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 02:56:23 +0000 |
commit | a928613a313e7750c7dcee824631cd6ed1690344 (patch) | |
tree | f34699396fb83afd534d74c79618324856794884 /file.c | |
parent | 1ebed6c6140a1c3fe0e6b157910cc1d2d1bd49bc (diff) | |
download | ruby-a928613a313e7750c7dcee824631cd6ed1690344.tar.gz |
revert previous changes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 22 |
1 files changed, 1 insertions, 21 deletions
@@ -107,6 +107,7 @@ rb_get_path_check(VALUE obj, int check) tmp = rb_check_string_type(obj); if (!NIL_P(tmp)) goto exit; + CONST_ID(to_path, "to_path"); if (rb_respond_to(obj, to_path)) { tmp = rb_funcall(obj, to_path, 0, 0); @@ -119,27 +120,6 @@ rb_get_path_check(VALUE obj, int check) if (check && obj != tmp) { rb_check_safe_obj(tmp); } - -#if defined _WIN32 || defined __APPLE__ - { - static rb_encoding *fs_encoding; - rb_encoding *fname_encoding = rb_enc_get(tmp); - if (!fs_encoding) - fs_encoding = rb_filesystem_encoding(); - if (rb_usascii_encoding() != fname_encoding - && rb_ascii8bit_encoding() != fname_encoding -#if defined __APPLE__ - && rb_utf8_encoding() != fname_encoding -#endif - && fs_encoding != fname_encoding) { - static VALUE fs_enc; - if (!fs_enc) - fs_enc = rb_enc_from_encoding(fs_encoding); - tmp = rb_str_encode(tmp, fs_enc, 0, Qnil); - } - } -#endif - return rb_str_new4(tmp); } |