diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 16:28:10 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 16:28:10 +0000 |
commit | 73f2c5c3b495e33869ddc3005a1ac42602bacf2f (patch) | |
tree | cc386a85527db3edd0734eefbaad219062428a5f /io.c | |
parent | b77c7dc903ce92a543e433066cc62dc822b4a7a7 (diff) |
merge -r 12143:12147
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 30 |
1 files changed, 19 insertions, 11 deletions
@@ -3026,11 +3026,29 @@ pipe_open(pstr, pname, mode) { int modef = rb_io_mode_flags(mode); OpenFile *fptr; - #if defined(DJGPP) || defined(__human68k__) || defined(__VMS) FILE *f; +#else + int pid; +#ifdef _WIN32 + FILE *fpr, *fpw; +#else + int pr[2], pw[2]; +#endif +#endif + volatile int doexec; if (!pname) pname = StringValueCStr(pstr); + doexec = (strcmp("-", pname) != 0); + +#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32) + if (!doexec) { + rb_raise(rb_eNotImpError, + "fork() function is unimplemented on this machine"); + } +#endif + +#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) f = popen(pname, mode); if (!f) rb_sys_fail(pname); @@ -3052,10 +3070,6 @@ pipe_open(pstr, pname, mode) } #else #ifdef _WIN32 - int pid; - FILE *fpr, *fpw; - - if (!pname) pname = StringValueCStr(pstr); retry: pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw); if (pid == -1) { /* exec failed */ @@ -3085,16 +3099,10 @@ retry: return (VALUE)port; } #else - int pid, pr[2], pw[2]; - volatile int doexec; - - if (!pname) pname = StringValueCStr(pstr); - if (((modef & FMODE_READABLE) && pipe(pr) == -1) || ((modef & FMODE_WRITABLE) && pipe(pw) == -1)) rb_sys_fail(pname); - doexec = (strcmp("-", pname) != 0); if (!doexec) { fflush(stdin); /* is it really needed? */ fflush(stdout); |