diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-25 05:55:12 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-25 05:55:12 +0000 |
commit | d7fe17edf08c1cee7f5b87251d2f09345900fcf9 (patch) | |
tree | 071d640b5afb70e2d3cd24f69342479768cdfd5f /io.c | |
parent | 106eb09a382fa9003b67a29e33598ef4205b83b9 (diff) |
2000-05-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1591,9 +1591,9 @@ rb_io_popen(str, argc, argv, klass) VALUE klass; { char *mode; - VALUE pname, pmode, port, proc; + VALUE pname, pmode, port; - if (rb_scan_args(argc, argv, "12", &pname, &pmode, &proc) == 1) { + if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) { mode = "r"; } else { @@ -1603,15 +1603,13 @@ rb_io_popen(str, argc, argv, klass) port = pipe_open(str, mode); if (NIL_P(port)) { /* child */ - if (!NIL_P(proc)) { - rb_eval_cmd(proc, rb_ary_new2(0)); - } - else if (rb_block_given_p()) { + if (rb_block_given_p()) { rb_yield(Qnil); + fflush(stdout); + fflush(stderr); + _exit(0); } - fflush(stdout); - fflush(stderr); - _exit(0); + return Qnil; } RBASIC(port)->klass = klass; if (rb_block_given_p()) { |