From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, avarab@gmail.com,
sunshine@sunshineco.com, jrnieder@gmail.com,
schwab@linux-m68k.org, patthoyts@gmail.com
Subject: [PATCH 05/15] mingw: support waitpid with pid > 0 and WNOHANG
Date: Fri, 22 Oct 2010 02:05:34 +0200 [thread overview]
Message-ID: <1287705944-5668-5-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1287705944-5668-1-git-send-email-kusmabite@gmail.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
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 e2e3c54..2e7c644 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1550,6 +1550,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 7c4eeea..379d7bf 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
--
1.7.3.1.199.g72340
next prev parent reply other threads:[~2010-10-22 0:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 0:05 [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 02/15] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 03/15] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 04/15] mingw: use real pid Erik Faye-Lund
2010-10-22 0:05 ` Erik Faye-Lund [this message]
2010-10-22 0:05 ` [PATCH 06/15] mingw: add kill emulation Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 07/15] daemon: use run-command api for async serving Erik Faye-Lund
2010-10-22 0:10 ` Jonathan Nieder
2010-10-22 0:20 ` Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 08/15] daemon: use full buffered mode for stderr Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 09/15] Improve the mingw getaddrinfo stub to handle more use cases Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 10/15] daemon: get remote host address from root-process Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 11/15] mingw: import poll-emulation from gnulib Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 12/15] mingw: use " Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 13/15] daemon: use socklen_t Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 14/15] daemon: make --inetd and --detcach incompatible Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 15/15] daemon: opt-out on features that require posix Erik Faye-Lund
2010-10-22 0:13 ` [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287705944-5668-5-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=patthoyts@gmail.com \
--cc=schwab@linux-m68k.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).