kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

revert previous changes.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-12-29 02:56:23 +00:00
parent 1ebed6c614
commit a928613a31
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
file.c
View file

@ -107,6 +107,7 @@ rb_get_path_check(VALUE obj, int check)
tmp = rb_check_string_type(obj); tmp = rb_check_string_type(obj);
if (!NIL_P(tmp)) goto exit; if (!NIL_P(tmp)) goto exit;
CONST_ID(to_path, "to_path"); CONST_ID(to_path, "to_path");
if (rb_respond_to(obj, to_path)) { if (rb_respond_to(obj, to_path)) {
tmp = rb_funcall(obj, to_path, 0, 0); tmp = rb_funcall(obj, to_path, 0, 0);
@ -119,27 +120,6 @@ rb_get_path_check(VALUE obj, int check)
if (check && obj != tmp) { if (check && obj != tmp) {
rb_check_safe_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); return rb_str_new4(tmp);
} }

19
io.c
View file

@ -4885,6 +4885,25 @@ rb_scan_open_args(int argc, VALUE *argv,
opt = pop_last_hash(&argc, argv); opt = pop_last_hash(&argc, argv);
rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm); rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
FilePathValue(fname); FilePathValue(fname);
#if defined _WIN32 || defined __APPLE__
{
static rb_encoding *fs_encoding;
rb_encoding *fname_encoding = rb_enc_get(fname);
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);
fname = rb_str_encode(fname, fs_enc, 0, Qnil);
}
}
#endif
rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p); rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p);