diff options
Diffstat (limited to 'common/exectool.c')
| -rw-r--r-- | common/exectool.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/common/exectool.c b/common/exectool.c index 96585f81d..2e54b79e1 100644 --- a/common/exectool.c +++ b/common/exectool.c @@ -43,8 +43,8 @@ #include "logging.h" #include "membuf.h" #include "mischelp.h" -#include "exechelp.h" #include "sysutils.h" +#include "exechelp.h" #include "util.h" #include "exectool.h" @@ -331,7 +331,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[], #else int exceptclose[2]; #endif - int extrapipe[2] = {-1, -1}; + gnupg_fd_t extrapipe[2] = { GNUPG_INVALID_FD, GNUPG_INVALID_FD }; char extrafdbuf[20]; const char *argsave = NULL; int argsaveidx; @@ -395,11 +395,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[], goto leave; } /* Do not close in child. */ -#ifdef HAVE_W32_SYSTEM - exceptclose[i] = (HANDLE)_get_osfhandle (extrapipe[0]); -#else exceptclose[i] = extrapipe[0]; -#endif /* Now find the argument marker and replace by the pipe's fd. Yeah, that is an ugly non-thread safe hack but it safes us to create a copy of the array. */ @@ -424,11 +420,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[], i++; } -#ifdef HAVE_W32_SYSTEM - exceptclose[i] = INVALID_HANDLE_VALUE; -#else - exceptclose[i] = -1; -#endif + exceptclose[i] = GNUPG_INVALID_FD; err = gpgrt_spawn_actions_new (&act); if (err) @@ -447,8 +439,12 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[], | GPGRT_PROCESS_STDERR_PIPE), act, &proc); gpgrt_process_get_streams (proc, GPGRT_PROCESS_STREAM_NONBLOCK, input? &infp : NULL, &outfp, &errfp); - if (extrapipe[0] != -1) + if (extrapipe[0] != GNUPG_INVALID_FD) +#ifdef HAVE_W32_SYSTEM + CloseHandle (extrapipe[0]); +#else close (extrapipe[0]); +#endif if (argsave) argv[argsaveidx] = argsave; if (err) |