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

* io.c (rb_scan_open_args): extracted from rb_open_file.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-20 11:16:59 +00:00
parent f684d04a66
commit 9074da1b44
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Aug 20 20:16:17 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_scan_open_args): extracted from rb_open_file.
Wed Aug 20 19:22:32 2008 Tanaka Akira <akr@fsij.org> Wed Aug 20 19:22:32 2008 Tanaka Akira <akr@fsij.org>
* io.c (convconfig_t): new type. * io.c (convconfig_t): new type.

24
io.c
View File

@ -4523,13 +4523,14 @@ io_set_encoding(VALUE io, VALUE opt)
} }
} }
static VALUE static void
rb_open_file(int argc, VALUE *argv, VALUE io) rb_scan_open_args(int argc, VALUE *argv,
VALUE *fname_p, int *modenum_p, int *flags_p,
convconfig_t *convconfig_p, unsigned int *fmode_p)
{ {
VALUE opt=Qnil, fname, vmode, perm; VALUE opt=Qnil, fname, vmode, perm;
int modenum, flags; int modenum, flags;
unsigned int fmode; unsigned int fmode;
convconfig_t convconfig = { NULL, NULL };
if (0 < argc) { if (0 < argc) {
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");
@ -4560,10 +4561,25 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
#endif #endif
FilePathValue(fname); FilePathValue(fname);
rb_io_extract_modeenc(vmode, opt, &modenum, &flags, &convconfig); rb_io_extract_modeenc(vmode, opt, &modenum, &flags, convconfig_p);
fmode = NIL_P(perm) ? 0666 : NUM2UINT(perm); fmode = NIL_P(perm) ? 0666 : NUM2UINT(perm);
*fname_p = fname;
*modenum_p = modenum;
*flags_p = flags;
*fmode_p = fmode;
}
static VALUE
rb_open_file(int argc, VALUE *argv, VALUE io)
{
VALUE fname;
int modenum, flags;
convconfig_t convconfig;
unsigned int fmode;
rb_scan_open_args(argc, argv, &fname, &modenum, &flags, &convconfig, &fmode);
rb_file_open_generic(io, RSTRING_PTR(fname), modenum, flags, &convconfig, fmode); rb_file_open_generic(io, RSTRING_PTR(fname), modenum, flags, &convconfig, fmode);
return io; return io;