ruby-changes:11649
From: nobu <ko1@a...>
Date: Sun, 26 Apr 2009 18:35:55 +0900 (JST)
Subject: [ruby-changes:11649] Ruby:r23287 (trunk): * io.c (io_reopen): keeps pathv for prep_stdio.
nobu 2009-04-26 18:35:34 +0900 (Sun, 26 Apr 2009) New Revision: 23287 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23287 Log: * io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131] Modified files: trunk/ChangeLog trunk/io.c Index: ChangeLog =================================================================== --- ChangeLog (revision 23286) +++ ChangeLog (revision 23287) @@ -1,3 +1,7 @@ +Sun Apr 26 18:35:32 2009 Nobuyoshi Nakada <nobu@r...> + + * io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131] + Sun Apr 26 15:13:09 2009 Nobuyoshi Nakada <nobu@r...> * lib/optparse.rb (OptionParser#parse_in_order): do not make an Index: io.c =================================================================== --- io.c (revision 23286) +++ io.c (revision 23287) @@ -5368,8 +5368,8 @@ 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/