diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-28 06:11:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-28 06:11:11 +0000 |
| commit | 7d51a12d9d547c6096f665f1cf9580eb24de6e4c (patch) | |
| tree | 6165f98f4ad2901f6d087798f3388dc1e9dede1a | |
| parent | 15548a5a243d0ab989df17fcf881e2522ef69e3f (diff) | |
* lib/open3.rb (Open3#popen3): use Thread.detach instead of
double-fork, so that the exit status can be obtained.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/open3.rb | 32 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 23 insertions, 20 deletions
@@ -1,3 +1,8 @@ +Sun Feb 28 15:11:07 2010 Nobuyoshi Nakada <[email protected]> + + * lib/open3.rb (Open3#popen3): use Thread.detach instead of + double-fork, so that the exit status can be obtained. + Wed Feb 24 22:39:15 2010 Tanaka Akira <[email protected]> * lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg. diff --git a/lib/open3.rb b/lib/open3.rb index fca0257cdd..ae3fffb40e 100644 --- a/lib/open3.rb +++ b/lib/open3.rb @@ -56,39 +56,37 @@ module Open3 pid = fork{ # child - fork{ - # grandchild - pw[1].close - STDIN.reopen(pw[0]) - pw[0].close + pw[1].close + STDIN.reopen(pw[0]) + pw[0].close - pr[0].close - STDOUT.reopen(pr[1]) - pr[1].close + pr[0].close + STDOUT.reopen(pr[1]) + pr[1].close - pe[0].close - STDERR.reopen(pe[1]) - pe[1].close + pe[0].close + STDERR.reopen(pe[1]) + pe[1].close - exec(*cmd) - } - exit!(0) + exec(*cmd) } pw[0].close pr[1].close pe[1].close - Process.waitpid(pid) + waiter = Process.detach(pid) pi = [pw[1], pr[0], pe[0]] + result = pi + [waiter] pw[1].sync = true if defined? yield begin - return yield(*pi) + return yield(*result) ensure pi.each{|p| p.close unless p.closed?} + waiter.join end end - pi + result end module_function :popen3 end @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-02-24" +#define RUBY_RELEASE_DATE "2010-02-28" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100224 +#define RUBY_RELEASE_CODE 20100228 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 28 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |