* struct.c (rb_struct_select): fix typo.

matz · matz · commit cd948e46002a · 2002-04-12T08:45:02.000Z
* io.c (io_write): check error if written data is less than
  specified size to detect EPIPE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,10 @@ Fri Apr 12 12:54:04 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* win32/config.h.in: define HAVE_COSH, HAVE_SINH, and HAVE_TANH.
 
+Fri Apr 12 02:58:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* struct.c (rb_struct_select): fix typo.
+
 Fri Apr 12 00:34:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* MANIFEST (missing/acosh.c): added.
@@ -17,6 +21,11 @@ Fri Apr 12 00:34:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* missing/acosh.c: added for acosh(), asinh() and atanh().
 
+Thu Apr 11 20:01:44 2002  Masahiro Tomita  <tommy@tmtm.org>
+
+	* io.c (io_write): check error if written data is less than
+	  specified size to detect EPIPE.
+
 Thu Apr 11 19:10:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* io.c (remain_size): IO#read returns "" if file.size == 0.
diff --git a/io.c b/io.c
@@ -290,11 +290,11 @@ io_write(io, str)
 		break;
 	n = ptr - RSTRING(str)->ptr;
     }
-    if (n == 0 && ferror(f))
+    if (n != RSTRING(str)->len && ferror(f))
 	rb_sys_fail(fptr->path);
 #else
     n = fwrite(RSTRING(str)->ptr, 1, RSTRING(str)->len, f);
-    if (n == 0 && ferror(f)) {
+    if (n != RSTRING(str)->len && ferror(f)) {
 	rb_sys_fail(fptr->path);
     }
 #endif
diff --git a/struct.c b/struct.c
@@ -540,7 +540,7 @@ rb_struct_select(argc, argv, s)
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
 	for (i = 0; i < RSTRUCT(s)->len; i++) {
-	    if (RTEST(rb_yield(RARRAY(s)->ptr[i]))) {
+	    if (RTEST(rb_yield(RSTRUCT(s)->ptr[i]))) {
 		rb_ary_push(result, RSTRUCT(s)->ptr[i]);
 	    }
 	}

Original file line number	Diff line number	Diff line change
`@@ -290,11 +290,11 @@ io_write(io, str)`
`290`	`290`	`break;`
`291`	`291`	`n = ptr - RSTRING(str)->ptr;`
`292`	`292`	`}`
`293`		`- if (n == 0 && ferror(f))`
	`293`	`+ if (n != RSTRING(str)->len && ferror(f))`
`294`	`294`	`rb_sys_fail(fptr->path);`
`295`	`295`	`#else`
`296`	`296`	`n = fwrite(RSTRING(str)->ptr, 1, RSTRING(str)->len, f);`
`297`		`- if (n == 0 && ferror(f)) {`
	`297`	`+ if (n != RSTRING(str)->len && ferror(f)) {`
`298`	`298`	`rb_sys_fail(fptr->path);`
`299`	`299`	`}`
`300`	`300`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ rb_struct_select(argc, argv, s)`
`540`	`540`	`rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);`
`541`	`541`	`}`
`542`	`542`	`for (i = 0; i < RSTRUCT(s)->len; i++) {`
`543`		`- if (RTEST(rb_yield(RARRAY(s)->ptr[i]))) {`
	`543`	`+ if (RTEST(rb_yield(RSTRUCT(s)->ptr[i]))) {`
`544`	`544`	`rb_ary_push(result, RSTRUCT(s)->ptr[i]);`
`545`	`545`	`}`
`546`	`546`	`}`