mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
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
This commit is contained in:
parent
adf4db6e20
commit
962058f704
11 changed files with 70 additions and 33 deletions
|
@ -864,6 +864,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
|
|||
opt.debug = 0;
|
||||
opt.no_grab = 1;
|
||||
opt.debug_pinentry = 0;
|
||||
xfree (opt.pinentry_program);
|
||||
opt.pinentry_program = NULL;
|
||||
opt.pinentry_touch_file = NULL;
|
||||
xfree (opt.pinentry_invisible_char);
|
||||
|
@ -924,7 +925,10 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
|
|||
case oNoGrab: opt.no_grab |= 1; break;
|
||||
case oGrab: opt.no_grab |= 2; break;
|
||||
|
||||
case oPinentryProgram: opt.pinentry_program = pargs->r.ret_str; break;
|
||||
case oPinentryProgram:
|
||||
xfree (opt.pinentry_program);
|
||||
opt.pinentry_program = make_filename_try (pargs->r.ret_str, NULL);
|
||||
break;
|
||||
case oPinentryTouchFile: opt.pinentry_touch_file = pargs->r.ret_str; break;
|
||||
case oPinentryInvisibleChar:
|
||||
xfree (opt.pinentry_invisible_char);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue