diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | io.c | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -1,11 +1,15 @@ +Tue Dec 23 23:49:37 2008 Tanaka Akira <akr@fsij.org> + + * io.c (rb_io_init_copy): call io_seek only if io_tell succeeds. + Tue Dec 23 22:57:48 2008 Tanaka Akira <akr@fsij.org> - * process.c (rb_fork): don't propagete an error message if error + * process.c (rb_fork): don't propagate an error message if error buffer not given. Tue Dec 23 21:55:05 2008 Tanaka Akira <akr@fsij.org> - * process.c (rb_fork): propagete an error message from child to parent. + * process.c (rb_fork): propagate an error message from child to parent. (rb_f_exec): show details of error in child process on exception. (save_redirect_fd): add error message arguments. @@ -5368,6 +5368,7 @@ rb_io_init_copy(VALUE dest, VALUE io) rb_io_t *fptr, *orig; int fd; VALUE write_io; + off_t pos; io = rb_io_get_io(io); if (dest == io) return dest; @@ -5386,7 +5387,9 @@ rb_io_init_copy(VALUE dest, VALUE io) fd = ruby_dup(orig->fd); fptr->fd = fd; - io_seek(fptr, io_tell(orig), SEEK_SET); + pos = io_tell(orig); + if (0 <= pos) + io_seek(fptr, pos, SEEK_SET); if (fptr->mode & FMODE_BINMODE) { rb_io_binmode(dest); } |