[PATCH v3 06/14] mingw: support waitpid with pid > 0 and WNOHANG
From: Erik Faye-Lund <hidden>
Date: 2016-06-15 22:49:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Erik Faye-Lund <redacted> --- compat/mingw.c | 6 ++++++ compat/mingw.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 4582345..55ea250 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c@@ -1609,6 +1609,12 @@ pid_t waitpid(pid_t pid, int *status, unsigned options) return -1; } + if (pid > 0 && options & WNOHANG) { + if (WAIT_OBJECT_0 != WaitForSingleObject((HANDLE)pid, 0)) + return 0; + options &= ~WNOHANG; + } + if (options == 0) { int i; if (WaitForSingleObject(h, INFINITE) != WAIT_OBJECT_0) {
diff --git a/compat/mingw.h b/compat/mingw.h
index 96ed931..6d7a3f6 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h@@ -153,6 +153,7 @@ static inline int mingw_unlink(const char *pathname) } #define unlink mingw_unlink +#define WNOHANG 1 pid_t waitpid(pid_t pid, int *status, unsigned options); #ifndef NO_OPENSSL
--
1.7.3.1.51.ge462f.dirty