diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Feb 6 23:28:33 2009 Tanaka Akira <akr@fsij.org> + + * io.c (io_fread): use rb_io_wait_readable for retry + avoid Errno::EINTR on ruby -e 'trap(:CHLD) {}; spawn("sleep 1"); STDIN.read' + Fri Feb 6 22:36:11 2009 Alexander Zavorine <alexandre.zavorine@nokia.com> * thread_pthread.c (native_thread_create) [__SYMBIAN32__]: reduced pthread stack size. @@ -1442,12 +1442,15 @@ io_fread(VALUE str, long offset, rb_io_t *fptr) if (READ_DATA_PENDING(fptr) == 0) { while (n > 0) { + again: c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n); if (c == 0) { io_set_eof(fptr); break; } if (c < 0) { + if (rb_io_wait_readable(fptr->fd)) + goto again; rb_sys_fail_path(fptr->pathv); } offset += c; |