diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | io.c | 30 |
2 files changed, 15 insertions, 17 deletions
@@ -1,5 +1,7 @@ Fri Nov 26 14:29:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + * io.c (rb_io_initialize): [ruby-dev:24963] + * io.c (rb_io_initialize): [ruby-dev:24962] Fri Nov 26 13:49:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org> @@ -3970,36 +3970,32 @@ rb_io_initialize(argc, argv, io) orig = rb_io_check_io(fnum); if (NIL_P(orig)) { fd = NUM2INT(fnum); - } - else { - 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 (argc != 2) { #if defined(HAVE_FCNTL) && defined(F_GETFL) - flags = fcntl(fd, F_GETFL); - if (flags == -1) rb_sys_fail(0); + flags = fcntl(fd, F_GETFL); + if (flags == -1) rb_sys_fail(0); #else - flags = O_RDONLY; + flags = O_RDONLY; #endif - } - fmode = rb_io_modenum_flags(flags); - if (!ofp) { + } MakeOpenFile(io, fp); - fp->mode = fmode; + fp->mode = rb_io_modenum_flags(flags); fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags)); } else { + 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) { + fmode = rb_io_modenum_flags(flags); if ((ofp->mode ^ fmode) & (FMODE_READWRITE|FMODE_BINMODE)) { if (FIXNUM_P(mode)) { rb_raise(rb_eArgError, "incompatible mode 0%o", flags); } else { - rb_raise(rb_eArgError, "incompatible mode %s", RSTRING(mode)->ptr); + rb_raise(rb_eArgError, "incompatible mode \"%s\"", RSTRING(mode)->ptr); } } } |