matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 16 insertions, 8 deletions

diff --git a/lib/open3.rb b/lib/open3.rb
index 27283f5019..11b9813bee 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -14,8 +14,8 @@ module Open3
     pr = IO::pipe
     pe = IO::pipe
 
-    pid = fork
-    if pid == nil then # child
+    pid = fork{
+      # child
       pw[1].close
       STDIN.reopen(pw[0])
       pw[0].close
@@ -29,13 +29,21 @@ module Open3
       pe[1].close
 
       exec(cmd)
-      exit
-    else
-      pw[0].close
-      pr[1].close
-      pe[1].close
-      pi = [ pw[1], pr[0], pe[0] ]
+      _exit 127
+    }
+
+    pw[0].close
+    pr[1].close
+    pe[1].close
+    Thread.start do
+      sleep 1
+      Process.waitpid(pid)
+    end
+    pi = [ pw[1], pr[0], pe[0] ]
+    if defined? yield
+      return yield *pi
     end
+    pi
   end
   module_function :popen3
 end