diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-26 09:35:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-26 09:35:34 +0000 |
| commit | 9c224036a16735f178ee43d2bb8c5a6e1e0349f3 (patch) | |
| tree | 09d5ea9d6d998b1d1460eeb525c5a440bc66f6e6 | |
| parent | 947a75c84059df32c42693f1d1f72b68617641a8 (diff) | |
| download | ruby-9c224036a16735f178ee43d2bb8c5a6e1e0349f3.tar.gz ruby-9c224036a16735f178ee43d2bb8c5a6e1e0349f3.tar.xz ruby-9c224036a16735f178ee43d2bb8c5a6e1e0349f3.zip | |
* io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io.c | 4 |
2 files changed, 6 insertions, 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 @@ -5368,8 +5368,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) |
