diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-06 12:31:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-06 12:31:53 +0000 |
commit | 1c544fccd27d399a444353905c8d921b1d1c5186 (patch) | |
tree | b0c51b67f8c95f0f532b29913823a2106d098ec6 | |
parent | d1521f4bb267875c9fa9eb6b5a23a81bc4a57002 (diff) | |
download | ruby-1c544fccd27d399a444353905c8d921b1d1c5186.tar.gz |
* io.c (io_reopen): avoid close if possible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 13 |
2 files changed, 9 insertions, 8 deletions
@@ -1,3 +1,7 @@ +Tue Oct 6 21:30:58 2009 Tanaka Akira <akr@fsij.org> + + * io.c (io_reopen): avoid close if possible. + Tue Oct 6 18:56:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * struct.c (rb_struct_select): Struct#select should return @@ -5684,20 +5684,17 @@ io_reopen(VALUE io, VALUE nfile) fd = fptr->fd; fd2 = orig->fd; if (fd != fd2) { - if (IS_PREP_STDIO(fptr)) { - /* need to keep stdio objects */ + if (IS_PREP_STDIO(fptr) || fd <= 2 || !fptr->stdio_file) { + /* need to keep FILE objects of stdin, stdout and stderr */ if (dup2(fd2, fd) < 0) rb_sys_fail_path(orig->pathv); } else { - if (fptr->stdio_file) - fclose(fptr->stdio_file); - else - close(fptr->fd); + fclose(fptr->stdio_file); fptr->stdio_file = 0; fptr->fd = -1; - if (dup2(fd2, fd) < 0) - rb_sys_fail_path(orig->pathv); + if (dup2(fd2, fd) < 0) + rb_sys_fail_path(orig->pathv); fptr->fd = fd; } rb_thread_fd_close(fd); |