path: root/compat/mingw.h
diff options
authorErik Faye-Lund <>2010-11-04 01:35:13 (GMT)
committerJunio C Hamano <>2010-11-04 23:53:50 (GMT)
commit52de4db57977175c5ad1d6c3922e772d6de08496 (patch)
tree81411c6bb7a805ced13cbaf8580992023b6d1e5e /compat/mingw.h
parentbb34c5aabe9f8d86a40d5ab8518fc78602264179 (diff)
mingw: use real pid
The Windows port have so far been using process handles in place of PID. However, this is not work consistent with what getpid returns. PIDs are system-global identifiers, but process handles are local to a process. Using PIDs instead of process handles allows, for instance, a user to kill a hung process with the Task Manager, something that would have been impossible with process handles. Change the code to use the real PID, and use OpenProcess to get a process-handle. Store the PID and the process handle in a linked list protected by a critical section, so we can safely close the process handle later. Linked list code written by Pat Thoyts. Signed-off-by: Erik Faye-Lund <> Signed-off-by: Pat Thoyts <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'compat/mingw.h')
1 files changed, 3 insertions, 7 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index a5bde82..7c4eeea 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -140,13 +140,7 @@ static inline int mingw_unlink(const char *pathname)
#define unlink mingw_unlink
-static inline pid_t waitpid(pid_t pid, int *status, unsigned options)
- if (options == 0)
- return _cwait(status, pid, 0);
- errno = EINVAL;
- return -1;
+pid_t waitpid(pid_t pid, int *status, unsigned options);
#ifndef NO_OPENSSL
#include <openssl/ssl.h>
@@ -321,11 +315,13 @@ void free_environ(char **env);
static int mingw_main(); \
int main(int argc, const char **argv) \
{ \
+ extern CRITICAL_SECTION pinfo_cs; \
_fmode = _O_BINARY; \
_setmode(_fileno(stdin), _O_BINARY); \
_setmode(_fileno(stdout), _O_BINARY); \
_setmode(_fileno(stderr), _O_BINARY); \
argv[0] = xstrdup(_pgmptr); \
+ InitializeCriticalSection(&pinfo_cs); \
return mingw_main(argc, argv); \
} \
static int mingw_main(c,v)