diff options
| author |  Erik Faye-Lund <kusmabite@gmail.com> | 2010-11-04 02:35:14 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-04 16:53:50 -0700 |
| commit | ef7108caf3cd200620000921f1b121f8c78d9d3b (patch) | |
| tree | fa9cb9d2cd0972b4a381f41f5c6b4189b1e891b8 | |
| parent | mingw: use real pid (diff) | |
| download | tgif-ef7108caf3cd200620000921f1b121f8c78d9d3b.tar.xz | |
mingw: support waitpid with pid > 0 and WNOHANG
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 8 | ||||
| -rw-r--r-- | compat/mingw.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 736d03fa0c..47a0e8861d 100644 --- 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 7c4eeea38c..379d7bff2c 100644 --- 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 |