From 94d336ef86cbbc43eadd90e185faecfb1097a9ff Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 May 2009 15:05:52 +0000
Subject: merges r23287 from trunk into ruby_1_9_1. -- * io.c (io_reopen):
 keeps pathv for prep_stdio.  [ruby-dev:38131]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'io.c')

diff --git a/io.c b/io.c
index a043573a69..1d7b6eea81 100644
--- a/io.c
+++ b/io.c
@@ -5236,8 +5236,8 @@ io_reopen(VALUE io, VALUE nfile)
     fptr->mode = orig->mode | (fptr->mode & FMODE_PREP);
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
-    if (orig->pathv) fptr->pathv = orig->pathv;
-    else fptr->pathv = Qnil;
+    if (RTEST(orig->pathv)) fptr->pathv = orig->pathv;
+    else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil;
     fptr->finalize = orig->finalize;
 #if defined (__CYGWIN__) || !defined(HAVE_FORK)
     if (fptr->finalize == pipe_finalize)
-- 
cgit v1.2.3