From 0fba0bbc6215a425ecbaba6c3a051f3aa6125b1d Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 1 Jun 2023 09:10:14 +0900
Subject: [PATCH] w32: Fix use of assuan_sendfd.

* kbx/kbx-client-util.c (prepare_data_pipe): Use _get_osfhandle
for pipe to be used for sentfd.
[HAVE_W32_SYSTEM] (datastream_thread): Add the case of NREAD==0.
* tools/gpg-connect-agent.c (do_sendfd): Use es_syshd instead
of es_fileno.
[HAVE_W32_SYSTEM] (do_open): Use %p for formating HANDLE.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 kbx/kbx-client-util.c     | 15 +++++++++--
 tools/gpg-connect-agent.c | 55 ++++++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c
index f9d06fab8..79d512bb3 100644
--- a/kbx/kbx-client-util.c
+++ b/kbx/kbx-client-util.c
@@ -118,10 +118,14 @@ prepare_data_pipe (kbx_client_data_t kcd)
       return err;  /* That should not happen.  */
     }
 
-  err = assuan_sendfd (kcd->ctx, INT2FD (inpipe[1]));
+#ifdef HAVE_W32_SYSTEM
+  err = assuan_sendfd (kcd->ctx, INT2FD (_get_osfhandle (inpipe[1])));
+#else
+  err = assuan_sendfd (kcd->ctx, inpipe[1]);
+#endif
   if (err)
     {
-      log_error ("sending sending fd %d to keyboxd: %s <%s>\n",
+      log_error ("sending fd %d to keyboxd: %s <%s>\n",
                  inpipe[1], gpg_strerror (err), gpg_strsource (err));
       es_fclose (infp);
       gnupg_close_pipe (inpipe[1]);
@@ -193,6 +197,13 @@ datastream_thread (void *arg)
           gnupg_sleep (1);
           continue;
         }
+#ifdef HAVE_W32_SYSTEM
+      if (nread == 0)
+        {
+          gnupg_sleep (1);
+          continue;
+        }
+#endif
       if (nread != 4)
         {
           err = gpg_error (GPG_ERR_EIO);
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index eb897287c..4dfb57896 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -898,8 +898,10 @@ static void
 do_sendfd (assuan_context_t ctx, char *line)
 {
   estream_t fp;
-  char *name, *mode, *p;
-  int rc, fd;
+  char *name, *p;
+  int rc;
+  char mode[32];
+  es_syshd_t hd;
 
   /* Get file name. */
   name = line;
@@ -911,17 +913,25 @@ do_sendfd (assuan_context_t ctx, char *line)
     p++;
 
   /* Get mode.  */
-  mode = p;
-  if (!*mode)
-    mode = "r";
+  if (!*p)
+    {
+      mode[0] = 'r';
+      mode[1] = 0;
+      p = &mode[1];
+    }
   else
     {
-      for (p=mode; *p && !spacep (p); p++)
-        ;
-      if (*p)
-        *p++ = 0;
+      int i;
+      for (i = 0; *p && !spacep (p); p++)
+        mode[i++] = *p;
+      mode[i] = 0;
+      p = &mode[i];
     }
 
+#ifdef HAVE_W32_SYSTEM
+  strcpy (p, ",sysopen");
+#endif
+
   /* Open and send. */
   fp = es_fopen (name, mode);
   if (!fp)
@@ -930,15 +940,30 @@ do_sendfd (assuan_context_t ctx, char *line)
                  name, mode, strerror (errno));
       return;
     }
-  fd = es_fileno (fp);
 
+  es_syshd (fp, &hd);
+
+#ifdef HAVE_W32_SYSTEM
+  if (opt.verbose)
+    log_error ("file '%s' opened in \"%s\" mode, fd=%p\n",
+               name, mode, hd.u.handle);
+#else
   if (opt.verbose)
     log_error ("file '%s' opened in \"%s\" mode, fd=%d\n",
-               name, mode, fd);
+               name, mode, hd.u.fd);
+#endif
 
-  rc = assuan_sendfd (ctx, INT2FD (fd) );
+#ifdef HAVE_W32_SYSTEM
+  rc = assuan_sendfd (ctx, hd.u.handle);
   if (rc)
-    log_error ("sending descriptor %d failed: %s\n", fd, gpg_strerror (rc));
+    log_error ("sending descriptor %p failed: %s\n", hd.u.handle,
+               gpg_strerror (rc));
+#else
+  rc = assuan_sendfd (ctx, hd.u.fd);
+  if (rc)
+    log_error ("sending descriptor %d failed: %s\n", hd.u.fd,
+               gpg_strerror (rc));
+#endif
   es_fclose (fp);
 }
 
@@ -1037,8 +1062,8 @@ do_open (char *line)
         open_fd_table[fd].handle = newhandle;
       }
       if (opt.verbose)
-        log_info ("file '%s' opened in \"%s\" mode, fd=%d  (libc=%d)\n",
-                   name, mode, (int)open_fd_table[fd].handle, fd);
+        log_info ("file '%s' opened in \"%s\" mode, fd=%p  (libc=%d)\n",
+                   name, mode, open_fd_table[fd].handle, fd);
       set_int_var (varname, (int)open_fd_table[fd].handle);
 #else /* Unix */
       if (opt.verbose)