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 /file.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 'file.c')
-rw-r--r-- | file.c | 29 |
1 files changed, 29 insertions, 0 deletions
@@ -103,6 +103,33 @@ VALUE rb_cStat; #define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj))) +VALUE +file_path_convert(VALUE name) +{ + rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name)); + rb_encoding *fs_encoding = rb_filesystem_encoding(); +#ifdef __APPLE__ + static rb_encoding *utf8mac_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) { + name = rb_str_conv_enc(name, fname_encoding, fs_encoding); + } +#elif !defined(_WIN32) + if (rb_default_internal_encoding() != NULL + && rb_usascii_encoding() != fname_encoding + && rb_ascii8bit_encoding() != fname_encoding + && fs_encoding != fname_encoding) { + name = rb_str_conv_enc(name, fname_encoding, fs_encoding); + } +#endif + return name; +} + static VALUE rb_get_path_check(VALUE obj, int level) { @@ -122,7 +149,9 @@ rb_get_path_check(VALUE obj, int level) else { tmp = obj; } + StringValue(tmp); exit: + tmp = file_path_convert(tmp); StringValueCStr(tmp); if (obj != tmp && insecure_obj_p(tmp, level)) { rb_insecure_operation(); |