From 9292a6254e40e2e76a53e3c1ae31cbc01e8e0958 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 21 Oct 2003 06:23:51 +0000 Subject: [PATCH] * win32/win32.c (do_spawn, do_aspawn): should return child's exit status to parent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 3 +++ win32/win32.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc52f35109..5a9bd74c03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ Tue Oct 21 15:08:53 2003 NAKAMURA Usaku * win32/win32.c (do_spawn, do_aspawn): should wait child process even if callded with P_OVERLAY. + * win32/win32.c (do_spawn, do_aspawn): should return child's exit + status to parent. + Tue Oct 21 00:35:02 2003 NAKAMURA, Hiroshi * test/soap/calc/*, test/soap/helloworld/*: catch the exception from diff --git a/win32/win32.c b/win32/win32.c index cbcecb6f8e..c85b1b48e8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -735,6 +735,7 @@ int mode; char *cmd; { struct ChildRecord *child; + DWORD exitcode; switch (mode) { case P_WAIT: @@ -759,7 +760,9 @@ char *cmd; return child->pid; case P_OVERLAY: WaitForSingleObject(child->hProcess, INFINITE); - exit(0); + GetExitCodeProcess(child->hProcess, &exitcode); + CloseChildHandle(child); + _exit(exitcode); default: return -1; /* not reached */ } @@ -774,6 +777,7 @@ char **argv; char *cmd, *p, *q, *s, **t; int len, n, bs, quote; struct ChildRecord *child; + DWORD exitcode; switch (mode) { case P_WAIT: @@ -850,7 +854,9 @@ char **argv; return child->pid; case P_OVERLAY: WaitForSingleObject(child->hProcess, INFINITE); - exit(0); + GetExitCodeProcess(child->hProcess, &exitcode); + CloseChildHandle(child); + _exit(exitcode); default: return -1; /* not reached */ }