ruby-changes:11750
From: yugui <ko1@a...>
Date: Tue, 12 May 2009 00:06:07 +0900 (JST)
Subject: [ruby-changes:11750] Ruby:r23397 (ruby_1_9_1): merges r23287 from trunk into ruby_1_9_1.
yugui 2009-05-12 00:05:52 +0900 (Tue, 12 May 2009) New Revision: 23397 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23397 Log: merges r23287 from trunk into ruby_1_9_1. -- * io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/io.c Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23396) +++ ruby_1_9_1/ChangeLog (revision 23397) @@ -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: ruby_1_9_1/io.c =================================================================== --- ruby_1_9_1/io.c (revision 23396) +++ ruby_1_9_1/io.c (revision 23397) @@ -5236,8 +5236,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/