From c97c3590530f9742ca0e49d36b3c953763d0224a Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 26 Nov 2004 05:30:45 +0000 Subject: * io.c (rb_io_initialize): [ruby-dev:24962] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe255531f1..4416660748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 26 14:29:39 2004 Yukihiro Matsumoto + + * io.c (rb_io_initialize): [ruby-dev:24962] + Fri Nov 26 13:49:06 2004 Yukihiro Matsumoto * io.c (rb_io_initialize): should retrieve flags from copying file diff --git a/io.c b/io.c index ef840e9225..0875fb552f 100644 --- a/io.c +++ b/io.c @@ -3958,10 +3958,6 @@ rb_io_initialize(argc, argv, io) rb_secure(4); rb_scan_args(argc, argv, "11", &fnum, &mode); - orig = rb_io_check_io(fnum); - if (NIL_P(orig)) { - fd = NUM2INT(fnum); - } if (argc == 2) { if (FIXNUM_P(mode)) { flags = FIX2LONG(mode); @@ -3971,14 +3967,18 @@ rb_io_initialize(argc, argv, io) flags = rb_io_mode_modenum(RSTRING(mode)->ptr); } } + orig = rb_io_check_io(fnum); + if (NIL_P(orig)) { + fd = NUM2INT(fnum); + } else { - if (!NIL_P(orig)) { - GetOpenFile(orig, ofp); - if (ofp->refcnt == LONG_MAX) { - VALUE s = rb_inspect(orig); - rb_raise(rb_eIOError, "too many shared IO for %s", StringValuePtr(s)); - } + GetOpenFile(orig, ofp); + if (ofp->refcnt == LONG_MAX) { + VALUE s = rb_inspect(orig); + rb_raise(rb_eIOError, "too many shared IO for %s", StringValuePtr(s)); } + } + if (argc != 2) { #if defined(HAVE_FCNTL) && defined(F_GETFL) flags = fcntl(fd, F_GETFL); if (flags == -1) rb_sys_fail(0); -- cgit v1.2.3