mingw: support waitpid with pid > 0 and WNOHANG

Signed-off-by: Erik Faye-Lund <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/compat/mingw.c b/compat/mingw.c
index 736d03fa0c3b61163325d9ef6933111e4ef2e656..47a0e8861dd5d55a77b3476119ee5504fc922126 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1554,6 +1554,14 @@ pid_t waitpid(pid_t pid, int *status, unsigned options)
                return -1;
        }
 
+       if (pid > 0 && options & WNOHANG) {
+               if (WAIT_OBJECT_0 != WaitForSingleObject(h, 0)) {
+                       CloseHandle(h);
+                       return 0;
+               }
+               options &= ~WNOHANG;
+       }
+
        if (options == 0) {
                struct pinfo_t **ppinfo;
                if (WaitForSingleObject(h, INFINITE) != WAIT_OBJECT_0) {

diff --git a/compat/mingw.h b/compat/mingw.h
index 7c4eeea38cd52bc6b719758f6346c0b9dcb96220..379d7bff2cf35ad0829dbf7a0a5cc27986d7578c 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -140,6 +140,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