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

io.c: rb_io_open_generic

Browse Source 
* io.c (rb_io_open_generic): split from rb_io_open without
  argument conversions.

* io.c (rb_io_s_binread): get rid of unnecessary object creation
  and conversion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-01-31 03:11:14 +00:00
parent c949aab59a
commit 610e39e949
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
io.c
View File

@ -6578,23 +6578,31 @@ rb_f_open(int argc, VALUE *argv)
return rb_io_s_open(argc, argv, rb_cFile); return rb_io_s_open(argc, argv, rb_cFile);
} }
static VALUE rb_io_open_generic(VALUE, int, int, const convconfig_t *, mode_t);
static VALUE static VALUE
rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt) rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
{ {
VALUE cmd;
int oflags, fmode; int oflags, fmode;
convconfig_t convconfig; convconfig_t convconfig;
mode_t perm; mode_t perm;
rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig); rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
perm = NIL_P(vperm) ? 0666 : NUM2MODET(vperm); perm = NIL_P(vperm) ? 0666 : NUM2MODET(vperm);
return rb_io_open_generic(filename, oflags, fmode, &convconfig, perm);
}
static VALUE
rb_io_open_generic(VALUE filename, int oflags, int fmode,
const convconfig_t *convconfig, mode_t perm)
{
VALUE cmd;
if (!NIL_P(cmd = check_pipe_command(filename))) { if (!NIL_P(cmd = check_pipe_command(filename))) {
return pipe_open_s(cmd, rb_io_oflags_modestr(oflags), fmode, &convconfig); return pipe_open_s(cmd, rb_io_oflags_modestr(oflags), fmode, convconfig);
} }
else { else {
return rb_file_open_generic(io_alloc(rb_cFile), filename, return rb_file_open_generic(io_alloc(rb_cFile), filename,
oflags, fmode, &convconfig, perm); oflags, fmode, convconfig, perm);
} }
} }
@ -9899,10 +9907,19 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
{ {
VALUE offset; VALUE offset;
struct foreach_arg arg; struct foreach_arg arg;
enum {
fmode = FMODE_READABLE|FMODE_BINMODE,
oflags = O_RDONLY
#ifdef O_BINARY
|O_BINARY
#endif
};
convconfig_t convconfig = {NULL, NULL, 0, Qnil};
rb_scan_args(argc, argv, "12", NULL, NULL, &offset); rb_scan_args(argc, argv, "12", NULL, NULL, &offset);
FilePathValue(argv[0]); FilePathValue(argv[0]);
arg.io = rb_io_open(argv[0], rb_str_new_cstr("rb:ASCII-8BIT"), Qnil, Qnil); convconfig.enc = rb_ascii8bit_encoding();
arg.io = rb_io_open_generic(argv[0], oflags, fmode, &convconfig, 0);
if (NIL_P(arg.io)) return Qnil; if (NIL_P(arg.io)) return Qnil;
arg.argv = argv+1; arg.argv = argv+1;
arg.argc = (argc > 1) ? 1 : 0; arg.argc = (argc > 1) ? 1 : 0;