From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v7 07/16] mingw: add kill emulation
Date: Thu, 4 Nov 2010 02:35:15 +0100 [thread overview]
Message-ID: <1288834524-2400-8-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1288834524-2400-1-git-send-email-kusmabite@gmail.com>
This is a quite limited kill-emulation; it can only handle
SIGTERM on positive pids. However, it's enough for git-daemon.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.c | 19 +++++++++++++++++++
compat/mingw.h | 3 +++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 47a0e88..146a6ed 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -936,6 +936,25 @@ void mingw_execv(const char *cmd, char *const *argv)
mingw_execve(cmd, argv, environ);
}
+int mingw_kill(pid_t pid, int sig)
+{
+ if (pid > 0 && sig == SIGTERM) {
+ HANDLE h = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
+
+ if (TerminateProcess(h, -1)) {
+ CloseHandle(h);
+ return 0;
+ }
+
+ errno = err_win_to_posix(GetLastError());
+ CloseHandle(h);
+ return -1;
+ }
+
+ errno = EINVAL;
+ return -1;
+}
+
static char **copy_environ(void)
{
char **env;
diff --git a/compat/mingw.h b/compat/mingw.h
index 379d7bf..51fca2f 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -143,6 +143,9 @@ static inline int mingw_unlink(const char *pathname)
#define WNOHANG 1
pid_t waitpid(pid_t pid, int *status, unsigned options);
+#define kill mingw_kill
+int mingw_kill(pid_t pid, int sig);
+
#ifndef NO_OPENSSL
#include <openssl/ssl.h>
static inline int mingw_SSL_set_fd(SSL *ssl, int fd)
--
1.7.3.2.162.g09d37
next prev parent reply other threads:[~2010-11-04 1:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-04 1:35 [PATCH v7 00/16] daemon-win32 Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 01/16] mingw: add network-wrappers for daemon Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 02/16] mingw: implement syslog Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 03/16] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 04/16] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 05/16] mingw: use real pid Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 06/16] mingw: support waitpid with pid > 0 and WNOHANG Erik Faye-Lund
2010-11-04 1:35 ` Erik Faye-Lund [this message]
2010-11-04 1:35 ` [PATCH v7 08/16] daemon: use run-command api for async serving Erik Faye-Lund
2011-01-04 4:04 ` [PATCH] daemon: support <directory> arguments again Jonathan Nieder
2011-01-04 12:42 ` Erik Faye-Lund
2011-01-04 19:18 ` Junio C Hamano
2010-11-04 1:35 ` [PATCH v7 09/16] daemon: use full buffered mode for stderr Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 10/16] Improve the mingw getaddrinfo stub to handle more use cases Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 11/16] daemon: get remote host address from root-process Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 12/16] mingw: import poll-emulation from gnulib Erik Faye-Lund
2011-07-06 9:06 ` Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 13/16] mingw: use " Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 14/16] daemon: use socklen_t Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 15/16] daemon: make --inetd and --detach incompatible Erik Faye-Lund
2010-11-04 1:35 ` [PATCH v7 16/16] daemon: opt-out on features that require posix 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=1288834524-2400-8-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).