diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io.c | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Nov 3 17:13:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * io.c (pipe_open): fix compile error + Wed Nov 3 16:58:07 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk.rb: support to use different Tcl commands between @@ -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); |