aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpg-card.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2024-02-27 09:35:46 +0000
committerWerner Koch <[email protected]>2024-02-27 09:36:22 +0000
commit962058f704867082d6d00f6467a79c78e41169ca (patch)
tree4cdb21422cdd037add8db508644ac39483cc8264 /tools/gpg-card.c
parentagent: Allow GET_PASSPHRASE in restricted mode. (diff)
downloadgnupg-962058f704867082d6d00f6467a79c78e41169ca.tar.gz
gnupg-962058f704867082d6d00f6467a79c78e41169ca.zip
Allow tilde expansion for the foo-program options.
* agent/gpg-agent.c (parse_rereadable_options): Use make_filename_try for opt.pinentry_program. Change definition accordingly. * g10/gpg.c (main): Use make_filename for agent_program, dirmngr_program, and keyboxd_program. Change definition accordingly. * sm/gpgsm.c (main): Ditto. * tools/gpg-card.c (parse_arguments): Ditto. * tools/gpg-connect-agent.c (main): Ditto. * tools/gpg-wks-client.c (parse_arguments): Likewise. Do it also for option --output. (process_confirmation_request): Print a note for a successful sent. -- GnuPG-bug-id: 7017
Diffstat (limited to 'tools/gpg-card.c')
-rw-r--r--tools/gpg-card.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index b34b42698..22b95d0d7 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -220,9 +220,15 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
}
break;
- case oGpgProgram: opt.gpg_program = pargs->r.ret_str; break;
- case oGpgsmProgram: opt.gpgsm_program = pargs->r.ret_str; break;
- case oAgentProgram: opt.agent_program = pargs->r.ret_str; break;
+ case oGpgProgram:
+ opt.gpg_program = make_filename (pargs->r.ret_str, NULL);
+ break;
+ case oGpgsmProgram:
+ opt.gpgsm_program = make_filename (pargs->r.ret_str, NULL);
+ break;
+ case oAgentProgram:
+ opt.agent_program = make_filename (pargs->r.ret_str, NULL);
+ break;
case oStatusFD:
gnupg_set_status_fd (translate_sys2libc_fd_int (pargs->r.ret_int, 1));