diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | file.c | 1 | ||||
-rw-r--r-- | io.c | 12 | ||||
-rw-r--r-- | rubyio.h | 1 |
4 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Oct 29 21:27:51 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_check_initialized): new function to check uninitialized + object. [ruby-talk:118234] + + * file.c (rb_file_path), io.c (rb_io_closed): check if initialized. + Fri Oct 29 19:05:33 2004 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf: follow nkf2.0. @@ -138,6 +138,7 @@ rb_file_path(obj) OpenFile *fptr; fptr = RFILE(rb_io_taint_check(obj))->fptr; + rb_io_check_initialized(fptr); if (!fptr->path) return Qnil; return rb_tainted_str_new2(fptr->path); } @@ -182,12 +182,19 @@ rb_io_taint_check(io) } void -rb_io_check_closed(fptr) +rb_io_check_initialized(fptr) OpenFile *fptr; { if (!fptr) { rb_raise(rb_eIOError, "uninitialized stream"); } +} + +void +rb_io_check_closed(fptr) + OpenFile *fptr; +{ + rb_io_check_initialized(fptr); if (!fptr->f && !fptr->f2) { rb_raise(rb_eIOError, "closed stream"); } @@ -941,7 +948,7 @@ rb_io_fread(ptr, len, f) ptr += c; if ((n -= c) <= 0) break; } - rb_thread_wait_fd(fileno(f)); + rb_thread_wait_fd(fileno(f)); TRAP_BEG; c = getc(f); TRAP_END; @@ -2028,6 +2035,7 @@ rb_io_closed(io) OpenFile *fptr; fptr = RFILE(io)->fptr; + rb_io_check_initialized(fptr); return (fptr->f || fptr->f2)?Qfalse:Qtrue; } @@ -69,6 +69,7 @@ void rb_io_check_writable _((OpenFile*)); void rb_io_check_readable _((OpenFile*)); int rb_io_fptr_finalize _((OpenFile*)); void rb_io_synchronized _((OpenFile*)); +void rb_io_check_initialized _((OpenFile*)); void rb_io_check_closed _((OpenFile*)); int rb_io_wait_readable _((int)); int rb_io_wait_writable _((int)); |