security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

common,gpg,kbx: Factor out open_stream_nc.

Browse Source 
* common/sysutils.h (open_stream_nc): New.
* common/sysutils.c (open_stream_nc): New.
* g10/decrypt.c (decrypt_message_fd): Use open_stream_nc.
* g10/server.c (cmd_verify): Likewise.
* kbx/kbxserver.c (prepare_outstream): Likewise.

--

GnuPG-bug-id: 6580
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-07 15:07:34 +09:00
parent 5bc949d230
commit 37343db08f
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
5 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/sysutils.c
View File

@ -1931,3 +1931,22 @@ gnupg_fd_valid (int fd)
close (d); close (d);
return 1; return 1;
} }
/* Open a stream from FD (a file descriptor on POSIX, a system
handle on Windows), non-closed. */
estream_t
open_stream_nc (gnupg_fd_t fd, const char *mode)
{
es_syshd_t syshd;
#ifdef HAVE_W32_SYSTEM
syshd.type = ES_SYSHD_HANDLE;
syshd.u.handle = fd;
#else
syshd.type = ES_SYSHD_FD;
syshd.u.fd = fd;
#endif
return es_sysopen_nc (&syshd, mode);
}

1
common/sysutils.h
View File

@ -109,6 +109,7 @@ gpg_error_t gnupg_inotify_watch_delete_self (int *r_fd, const char *fname);
gpg_error_t gnupg_inotify_watch_socket (int *r_fd, const char *socket_name); gpg_error_t gnupg_inotify_watch_socket (int *r_fd, const char *socket_name);
int gnupg_inotify_has_name (int fd, const char *name); int gnupg_inotify_has_name (int fd, const char *name);
estream_t open_stream_nc (gnupg_fd_t fd, const char *mode);
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
int gnupg_w32_set_errno (int ec); int gnupg_w32_set_errno (int ec);

10
g10/decrypt.c
View File

@ -114,7 +114,6 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd,
IOBUF fp; IOBUF fp;
armor_filter_context_t *afx = NULL; armor_filter_context_t *afx = NULL;
progress_filter_context_t *pfx; progress_filter_context_t *pfx;
es_syshd_t syshd;
if (opt.outfp) if (opt.outfp)
return gpg_error (GPG_ERR_BUG); return gpg_error (GPG_ERR_BUG);
@ -140,14 +139,7 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd,
return err; return err;
} }
#ifdef HAVE_W32_SYSTEM opt.outfp = open_stream_nc (output_fd, "w");
syshd.type = ES_SYSHD_HANDLE;
syshd.u.handle = output_fd;
#else
syshd.type = ES_SYSHD_FD;
syshd.u.fd = output_fd;
#endif
opt.outfp = es_sysopen_nc (&syshd, "w");
if (!opt.outfp) if (!opt.outfp)
{ {
char xname[64]; char xname[64];

11
g10/server.c
View File

@ -388,16 +388,7 @@ cmd_verify (assuan_context_t ctx, char *line)
if (out_fd != GNUPG_INVALID_FD) if (out_fd != GNUPG_INVALID_FD)
{ {
es_syshd_t syshd; out_fp = open_stream_nc (fd, "w");
#ifdef HAVE_W32_SYSTEM
syshd.type = ES_SYSHD_HANDLE;
syshd.u.handle = out_fd;
#else
syshd.type = ES_SYSHD_FD;
syshd.u.fd = out_fd;
#endif
out_fp = es_sysopen_nc (&syshd, "w");
if (!out_fp) if (!out_fp)
return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); return set_error (gpg_err_code_from_syserror (), "fdopen() failed");
} }

11
kbx/kbxserver.c
View File

@ -144,16 +144,7 @@ prepare_outstream (ctrl_t ctrl)
return 0; /* No Output command active. */ return 0; /* No Output command active. */
else else
{ {
es_syshd_t syshd; out_fp = open_stream_nc (fd, "w");
#ifdef HAVE_W32_SYSTEM
syshd.type = ES_SYSHD_HANDLE;
syshd.u.handle = fd;
#else
syshd.type = ES_SYSHD_FD;
syshd.u.fd = fd;
#endif
out_fp = es_sysopen_nc (&syshd, "w");
if (!out_fp) if (!out_fp)
return gpg_err_code_from_syserror (); return gpg_err_code_from_syserror ();
} }