From fcb79d5324e2fc3f5943d5d61f44c4d0640965e1 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 9 Jul 2015 06:10:47 +0000 Subject: * win32/win32.c (waitpid): return immediately if interrupted. reported by [ruby-dev:49176] [Bug #11340] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index b8563aad2c..1a37b61d3a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4296,9 +4296,10 @@ 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) { /* still active */ - if (options & WNOHANG) { + if ((options & WNOHANG) || errno == EINTR) { pid = 0; break; } -- cgit v1.2.1