diff options
| author | Werner Koch <[email protected]> | 2016-06-07 08:59:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-07 08:59:46 +0000 |
| commit | 22a7ef01aa2c0eb77bcc40174d09104acc35cab1 (patch) | |
| tree | 3782b20549fcc48d2598128676227d9a16f785b6 /g10/gpgv.c | |
| parent | po: Update Japanese translation. (diff) | |
| download | gnupg-22a7ef01aa2c0eb77bcc40174d09104acc35cab1.tar.gz gnupg-22a7ef01aa2c0eb77bcc40174d09104acc35cab1.zip | |
Replace use of opt.homedir by accessor functions.
* common/homedir.c (the_gnupg_homedir): New var.
(gnupg_set_homedir): New.
(gnupg_homedir): New.
* g10/options.h (struct opt): Remove 'homedir' and replace all users
by the new accessor functions.
* g13/g13-common.h (struct opt): Ditto.
* scd/scdaemon.h (struct opt): Ditto.
* sm/gpgsm.h (struct opt): Ditto.
* dirmngr/dirmngr.h (struct opt): Ditto.
* agent/preset-passphrase.c (opt_homedir): Ditto.
* agent/protect-tool.c (opt_homedir): Ditto.
--
This will make detection of a non-default homedir easier.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpgv.c')
| -rw-r--r-- | g10/gpgv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index f1e994bff..30b44220c 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -169,7 +169,6 @@ main( int argc, char **argv ) opt.trust_model = TM_ALWAYS; opt.batch = 1; - opt.homedir = default_homedir (); opt.weak_digests = NULL; tty_no_terminal(1); @@ -196,7 +195,7 @@ main( int argc, char **argv ) case oLoggerFD: log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1)); break; - case oHomedir: opt.homedir = pargs.r.ret_str; break; + case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break; case oWeakDigest: additional_weak_digest(pargs.r.ret_str); break; |