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
|
@ -82,9 +82,9 @@ static gpgrt_opt_t opts[] = {
|
|||
ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
|
||||
ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict",
|
||||
N_("make timestamp conflicts only a warning")),
|
||||
ARGPARSE_s_i (oStatusFD, "status-fd",
|
||||
ARGPARSE_s_s (oStatusFD, "status-fd",
|
||||
N_("|FD|write status info to this FD")),
|
||||
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
||||
ARGPARSE_s_s (oLoggerFD, "logger-fd", "@"),
|
||||
ARGPARSE_s_s (oLoggerFile, "log-file", "@"),
|
||||
ARGPARSE_s_s (oHomedir, "homedir", "@"),
|
||||
ARGPARSE_s_s (oWeakDigest, "weak-digest",
|
||||
|
@ -232,10 +232,10 @@ main( int argc, char **argv )
|
|||
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
|
||||
case oOutput: opt.outfile = pargs.r.ret_str; break;
|
||||
case oStatusFD:
|
||||
set_status_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
|
||||
set_status_fd (translate_sys2libc_fdstr (pargs.r.ret_str, 1));
|
||||
break;
|
||||
case oLoggerFD:
|
||||
log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
|
||||
log_set_fd (translate_sys2libc_fdstr (pargs.r.ret_str, 1));
|
||||
break;
|
||||
case oLoggerFile:
|
||||
log_set_file (pargs.r.ret_str);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue