From 6498dc0cb8ddabf5904ff71069343f1bbef113d1 Mon Sep 17 00:00:00 2001 From: nagai Date: Wed, 3 Nov 2004 08:14:25 +0000 Subject: * io.c (pipe_open): fix compile error git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1b6fcfd2..0b7367717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 3 17:13:02 2004 Hidetoshi NAGAI + + * io.c (pipe_open): fix compile error + Wed Nov 3 16:58:07 2004 Hidetoshi NAGAI * ext/tk/lib/tk.rb: support to use different Tcl commands between diff --git a/io.c b/io.c index 7f104f1e8..c1e68fba4 100644 --- a/io.c +++ b/io.c @@ -2592,9 +2592,11 @@ pipe_open(pstr, pname, mode) int modef = rb_io_mode_flags(mode); OpenFile *fptr; - if (!pname) pname = StringValuePtr(pstr); #if defined(DJGPP) || defined(__human68k__) || defined(__VMS) - FILE *f = popen(pname, mode); + FILE *f; + + if (!pname) pname = StringValuePtr(pstr); + f = popen(pname, mode); if (!f) rb_sys_fail(pname); else { @@ -2618,6 +2620,8 @@ pipe_open(pstr, pname, mode) int pid; FILE *fpr, *fpw; + if (!pname) pname = StringValuePtr(pstr); + retry: pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw); if (pid == -1) { /* exec failed */ @@ -2650,6 +2654,8 @@ retry: int pid, pr[2], pw[2]; volatile int doexec; + if (!pname) pname = StringValuePtr(pstr); + if (((modef & FMODE_READABLE) && pipe(pr) == -1) || ((modef & FMODE_WRITABLE) && pipe(pw) == -1)) rb_sys_fail(pname); -- cgit