From f0ecc07c4e4866e1509316639c0ca4cfc5385d53 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 26 Jun 2023 10:17:23 +0900
Subject: [PATCH] tools: Fix use of EXCEPTS when spawning a process.

* tools/gpgtar-create.c (gpgtar_create) [HAVE_W32_SYSTEM]: Use HANDLE.
* tools/gpgtar-extract.c (gpgtar_extract) [HAVE_W32_SYSTEM]: Likewise.
* tools/gpgtar-list.c (gpgtar_list) [HAVE_W32_SYSTEM]: Likewise.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 common/sysutils.c      | 2 +-
 tools/gpgtar-create.c  | 4 ++++
 tools/gpgtar-extract.c | 4 ++++
 tools/gpgtar-list.c    | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/sysutils.c b/common/sysutils.c
index b6e22e943..7c3667ce7 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -648,7 +648,7 @@ int
 translate_sys2libc_fdstr (const char *fdstr, int for_write)
 {
   gpg_error_t err;
-  gnupg_fd_t fd;
+  int fd;
 
   err = gnupg_sys2libc_fdstr (fdstr, for_write, NULL, &fd);
   if (err)
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 99da9ecf0..534141cc1 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -1228,7 +1228,11 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
     {
       strlist_t arg;
       ccparray_t ccp;
+#ifdef HAVE_W32_SYSTEM
+      HANDLE except[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
+#else
       int except[2] = { -1, -1 };
+#endif
       const char **argv;
 
       /* '--encrypt' may be combined with '--symmetric', but 'encrypt'
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 33b88ff4d..87113b054 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -384,7 +384,11 @@ gpgtar_extract (const char *filename, int decrypt)
     {
       strlist_t arg;
       ccparray_t ccp;
+#ifdef HAVE_W32_SYSTEM
+      HANDLE except[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
+#else
       int except[2] = { -1, -1 };
+#endif
       const char **argv;
 
       ccparray_init (&ccp, 0);
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 846008ee8..0c5e474f3 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -468,7 +468,11 @@ gpgtar_list (const char *filename, int decrypt)
     {
       strlist_t arg;
       ccparray_t ccp;
+#ifdef HAVE_W32_SYSTEM
+      HANDLE except[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
+#else
       int except[2] = { -1, -1 };
+#endif
       const char **argv;
 
       ccparray_init (&ccp, 0);