security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Use gnupg_fd_t for create_pipe_and_estream.

Browse source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-07-03 15:23:58 +09:00
parent 7b2a114d45
commit c845adb5a1
No known key found for this signature in database
GPG key ID: 640114AF89DE6054
7 changed files with 71 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kbx/kbx-client-util.c
View file

@ -30,6 +30,7 @@
#include "../common/membuf.h"
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/host2net.h"
@ -102,7 +103,7 @@ prepare_data_pipe (kbx_client_data_t kcd)
{
gpg_error_t err;
int rc;
int inpipe[2];
gnupg_fd_t inpipe[2];
estream_t infp;
npth_attr_t tattr;
@ -118,17 +119,22 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err; /* That should not happen. */
}
#ifdef HAVE_W32_SYSTEM
err = assuan_sendfd (kcd->ctx, (HANDLE)_get_osfhandle (inpipe[1]));
#else
err = assuan_sendfd (kcd->ctx, inpipe[1]);
#endif
if (err)
{
#ifdef HAVE_W32_SYSTEM
log_error ("sending fd %p to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err));
#else
log_error ("sending fd %d to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err));
#endif
es_fclose (infp);
gnupg_close_pipe (inpipe[1]);
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe[1]);
#else
close (inpipe[1]);
#endif
return err;
}
@ -142,7 +148,11 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err;
}
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe[1]);
#else
close (inpipe[1]);
#endif
kcd->fp = infp;
rc = npth_attr_init (&tattr);