kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (rb_io_init_copy): call io_seek only if io_tell succeeds.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-12-23 15:22:18 +00:00
parent b54087529e
commit 19fee2e2e0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 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. buffer not given.
Tue Dec 23 21:55:05 2008 Tanaka Akira <akr@fsij.org> 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 (rb_f_exec): show details of error in child process on
exception. exception.
(save_redirect_fd): add error message arguments. (save_redirect_fd): add error message arguments.

5
io.c
View file

@ -5368,6 +5368,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
rb_io_t *fptr, *orig; rb_io_t *fptr, *orig;
int fd; int fd;
VALUE write_io; VALUE write_io;
off_t pos;
io = rb_io_get_io(io); io = rb_io_get_io(io);
if (dest == io) return dest; if (dest == io) return dest;
@ -5386,7 +5387,9 @@ rb_io_init_copy(VALUE dest, VALUE io)
fd = ruby_dup(orig->fd); fd = ruby_dup(orig->fd);
fptr->fd = 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) { if (fptr->mode & FMODE_BINMODE) {
rb_io_binmode(dest); rb_io_binmode(dest);
} }