summaryrefslogtreecommitdiff
path: root/win32/win32.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-09 06:38:16 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-09 06:38:16 +0000
commitb3544b2551b8a0fd931e867c4126cdd9d79a4bba (patch)
treeff2af3b9ff4ae5da976a2260c6b0dd16fbfea41c /win32/win32.c
parentfcb79d5324e2fc3f5943d5d61f44c4d0640965e1 (diff)
* win32/win32.c (waitpid): fixed return value of previous commit. thanks, nobu!
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 1a37b61..34995c5 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4296,10 +4296,11 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
while (!(pid = poll_child_status(child, stat_loc))) {
/* wait... */
- errno = 0;
- if (rb_w32_wait_events_blocking(&child->hProcess, 1, timeout) != WAIT_OBJECT_0) {
+ int ret = rb_w32_wait_events_blocking(&child->hProcess, 1, timeout);
+ if (ret == WAIT_OBJECT_0 + 1) return -1; /* maybe EINTR */
+ if (ret != WAIT_OBJECT_0) {
/* still active */
- if ((options & WNOHANG) || errno == EINTR) {
+ if (options & WNOHANG) {
pid = 0;
break;
}