aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpg-card.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-06-27 05:44:01 +0000
committerNIIBE Yutaka <[email protected]>2023-06-27 05:44:01 +0000
commitb9b0c183204f81ae12b31ef15045ebee98a4c970 (patch)
tree9cf0a61b0a17b9a21b89f32aad996341200708d9 /tools/gpg-card.c
parentagent: Fix cast mistake for Windows. (diff)
downloadgnupg-b9b0c183204f81ae12b31ef15045ebee98a4c970.tar.gz
gnupg-b9b0c183204f81ae12b31ef15045ebee98a4c970.zip
common,gpg,sm,tools: Don't remove translate_sys2libc_fd_int.
* common/sysutils.c (translate_sys2libc_fd_int): Recover. (translate_sys2libc_fdstr): Remove. (check_special_filename): Follow the change. * common/sysutils.h (translate_sys2libc_fd_int): Recover. (translate_sys2libc_fdstr): Remove. * g10/gpg.c, g10/gpgv.c, sm/gpgsm.c: Revert the changes. * tools/gpg-auth.c, tools/gpg-card.c, tools/gpg-pair-tool.c: Likewise. * tools/gpg-wks-client.c, tools/gpgconf.c: Likewise. -- GnuPG-bug-id: 6551 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'tools/gpg-card.c')
-rw-r--r--tools/gpg-card.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 24518d105..4002cc185 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -94,7 +94,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_s (oDebug, "debug", "@"),
ARGPARSE_s_s (oGpgProgram, "gpg", "@"),
ARGPARSE_s_s (oGpgsmProgram, "gpgsm", "@"),
- ARGPARSE_s_s (oStatusFD, "status-fd", N_("|FD|write status info to this FD")),
+ ARGPARSE_s_i (oStatusFD, "status-fd", N_("|FD|write status info to this FD")),
ARGPARSE_s_n (oWithColons, "with-colons", "@"),
ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
@@ -225,7 +225,7 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
case oAgentProgram: opt.agent_program = pargs->r.ret_str; break;
case oStatusFD:
- gnupg_set_status_fd (translate_sys2libc_fdstr (pargs->r.ret_str, 1));
+ gnupg_set_status_fd (translate_sys2libc_fd_int (pargs->r.ret_int, 1));
break;
case oWithColons: opt.with_colons = 1; break;