From 4c25e2fb8ba17a4d83f3e55c6ddfa5ae417d1f7c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Jun 2013 17:44:47 +0000
Subject: win32.c: wait until exit

* win32/win32.c (waitpid): should not return 0 but wait until exit
  unless WNOHANG is given.  waiting huge process may return while
  active, for some reason.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/win32.c b/win32/win32.c
index 7b42df096f..0fc4186fff 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4153,8 +4153,10 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
 	    /* wait... */
 	    if (rb_w32_wait_events_blocking(&child->hProcess, 1, timeout) != WAIT_OBJECT_0) {
 		/* still active */
-		pid = 0;
-		break;
+		if (options & WNOHANG) {
+		    pid = 0;
+		    break;
+		}
 	    }
 	}
     }
-- 
cgit v1.2.3