mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg,sm,tools: Use string for option --*-fd.
* g10/gpg.c (opts): Use string for oLoggerFD, oOverrideSessionKeyFD, oStatusFD, oAttributeFD, oCommandFD, and oPassphraseFD. (main): Use translate_sys2libc_fdstr. * g10/gpgv.c (opts): Use string for oLoggerFD, and oStatusFD. (main): Use translate_sys2libc_fdstr. * sm/gpgsm.c (opts): Use string for oLoggerFD, oStatusFD, and oPassphraseFD. (main): Use translate_sys2libc_fdstr. * tools/gpg-auth.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. tools/gpg-card.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. * tools/gpg-pair-tool.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. * tools/gpg-wks-client.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. * tools/gpgconf.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. * tools/gpgtar-create.c (gpgtar_create): Fix for opt.status_fd. * tools/gpgtar-extract.c (gpgtar_extract): Fix for opt.status_fd. * tools/gpgtar-list.c (gpgtar_list): Fix for opt.status_fd. * tools/gpgtar.c (opts): Use string for oStatusFD. (main): Use translate_sys2libc_fdstr. * tools/gpgtar.h (opts): Use string for oStatusFD. -- GnuPG-bug-id: 6551 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
04d0851cca
commit
2756147e39
13 changed files with 88 additions and 50 deletions
|
@ -1246,13 +1246,19 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
|
|||
ccparray_put (&ccp, "--no");
|
||||
if (opt.require_compliance)
|
||||
ccparray_put (&ccp, "--require-compliance");
|
||||
if (opt.status_fd != -1)
|
||||
if (opt.status_fd)
|
||||
{
|
||||
static char tmpbuf[40];
|
||||
es_syshd_t hd;
|
||||
|
||||
snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
|
||||
snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%s", opt.status_fd);
|
||||
ccparray_put (&ccp, tmpbuf);
|
||||
except[0] = opt.status_fd;
|
||||
es_syshd (opt.status_stream, &hd);
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
except[0] = hd.u.handle;
|
||||
#else
|
||||
except[0] = hd.u.fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
ccparray_put (&ccp, "--output");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue