mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
19ad6658b5
commit
94d336ef86
2 changed files with 6 additions and 2 deletions
|
|
@ -1,3 +1,7 @@
|
|||
Sun Apr 26 18:35:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131]
|
||||
|
||||
Sun Apr 26 15:13:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
|
||||
|
|
|
|||
4
io.c
4
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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue