From 1c544fccd27d399a444353905c8d921b1d1c5186 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 6 Oct 2009 12:31:53 +0000 Subject: * 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 --- io.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index d8af0bdc2b..e3f913af23 100644 --- a/io.c +++ b/io.c @@ -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); -- cgit v1.2.3