From bbd798caa2e148e0ebd10b6a6f9aeaf1301a54d0 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 May 2000 05:55:12 +0000
Subject: 2000-05-25

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 io.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'io.c')

diff --git a/io.c b/io.c
index 4ce2339bb..f5b6e45e8 100644
--- a/io.c
+++ b/io.c
@@ -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()) {
-- 
cgit