* eval.c (ruby_stop): should not trace error handler.

* io.c (io_write): should not raise exception on O_NONBLOCK io.

* dir.c (dir_set_pos): seek should return dir, pos= should not.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 4 deletions

diff --git a/io.c b/io.c
index d5fcbeb2c9..d2abd6544f 100644
--- a/io.c
+++ b/io.c
@@ -247,14 +247,14 @@ io_write(io, str)
 	n = (int)RSTRING(str)->len;
 	while (--n >= 0)
 	    if (fputc(*ptr++, f) == EOF)
-		rb_sys_fail(fptr->path);
+		break;
 	n = ptr - RSTRING(str)->ptr;
     }
-    if (ferror(f))
+    if (n == 0 && ferror(f))
 	rb_sys_fail(fptr->path);
 #else
     n = fwrite(RSTRING(str)->ptr, 1, RSTRING(str)->len, f);
-    if (ferror(f)) {
+    if (n == 0 && ferror(f)) {
 	rb_sys_fail(fptr->path);
     }
 #endif
@@ -920,7 +920,7 @@ rb_io_each_byte(io)
 	rb_yield(INT2FIX(c & 0xff));
     }
     if (ferror(f)) rb_sys_fail(fptr->path);
-    return Qnil;
+    return io;
 }
 
 VALUE
@@ -1084,6 +1084,7 @@ rb_io_close_m(io)
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
+    rb_io_check_closed(RFILE(io)->fptr);
     rb_io_close(io);
     return Qnil;
 }