1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (io_set_encoding): removed.

Browse Source 
(rb_io_open): set up encoding using new argument opt.
  (open_key_args): call rb_io_open with opt.  don't call
  io_set_encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-20 14:56:23 +00:00
parent 4046ecde2f
commit 578fc84000
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Aug 20 23:53:42 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_set_encoding): removed.
(rb_io_open): set up encoding using new argument opt.
(open_key_args): call rb_io_open with opt. don't call
io_set_encoding.
Wed Aug 20 22:30:33 2008 Tanaka Akira <akr@fsij.org> Wed Aug 20 22:30:33 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_file_open_internal): use rb_io_flags_modenum. * io.c (rb_file_open_internal): use rb_io_flags_modenum.

33
io.c
View File

@ -4509,20 +4509,6 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
return port; return port;
} }
static void
io_set_encoding(VALUE io, VALUE opt)
{
rb_io_t *fptr;
rb_encoding *enc, *enc2;
if (io_extract_encoding_option(opt, &enc, &enc2)) {
GetOpenFile(io, fptr);
fptr->enc = enc;
fptr->enc2 = enc2;
clear_codeconv(fptr);
}
}
static void static void
rb_scan_open_args(int argc, VALUE *argv, rb_scan_open_args(int argc, VALUE *argv,
VALUE *fname_p, int *modenum_p, int *flags_p, VALUE *fname_p, int *modenum_p, int *flags_p,
@ -4793,14 +4779,19 @@ rb_f_open(int argc, VALUE *argv)
} }
static VALUE static VALUE
rb_io_open(const char *fname, const char *mode) rb_io_open(const char *fname, VALUE mode, VALUE opt)
{ {
int modenum, flags;
convconfig_t convconfig;
rb_io_extract_modeenc(mode, opt, &modenum, &flags, &convconfig);
if (fname[0] == '|') { if (fname[0] == '|') {
VALUE cmd = rb_str_new2(fname+1); VALUE cmd = rb_str_new2(fname+1);
return pipe_open_s(cmd, mode); return pipe_open_s(cmd, rb_io_modenum_mode(modenum));
} }
else { else {
return rb_file_open_internal(io_alloc(rb_cFile), fname, mode); return rb_file_open_generic(io_alloc(rb_cFile), fname,
modenum, flags, &convconfig, 0666);
} }
} }
@ -6691,7 +6682,7 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
arg->argv = argv + 1; arg->argv = argv + 1;
if (argc == 1) { if (argc == 1) {
no_key: no_key:
arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r"); arg->io = rb_io_open(RSTRING_PTR(argv[0]), INT2NUM(O_RDONLY), Qnil);
return; return;
} }
opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash"); opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
@ -6713,13 +6704,11 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
} }
v = rb_hash_aref(opt, sym_mode); v = rb_hash_aref(opt, sym_mode);
if (!NIL_P(v)) { if (!NIL_P(v)) {
arg->io = rb_io_open(RSTRING_PTR(argv[0]), StringValueCStr(v)); arg->io = rb_io_open(RSTRING_PTR(argv[0]), v, opt);
} }
else { else {
arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r"); arg->io = rb_io_open(RSTRING_PTR(argv[0]), INT2NUM(O_RDONLY), opt);
} }
io_set_encoding(arg->io, opt);
} }
static VALUE static VALUE