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 /scd/command.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 'scd/command.c')
| -rw-r--r-- | scd/command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scd/command.c b/scd/command.c index 72ff1326a..a4a2ba056 100644 --- a/scd/command.c +++ b/scd/command.c @@ -2281,7 +2281,7 @@ update_reader_status_file (int set_card_removed_flag) depends on how client sessions will associate the reader status with their session. */ snprintf (templ, sizeof templ, "reader_%d.status", vr->slot); - fname = make_filename (opt.homedir, templ, NULL ); + fname = make_filename (gnupg_homedir (), templ, NULL ); fp = fopen (fname, "w"); if (fp) { @@ -2300,7 +2300,7 @@ update_reader_status_file (int set_card_removed_flag) char *homestr, *envstr; gpg_error_t err; - homestr = make_filename (opt.homedir, NULL); + homestr = make_filename (gnupg_homedir (), NULL); if (gpgrt_asprintf (&envstr, "GNUPGHOME=%s", homestr) < 0) log_error ("out of core while building environment\n"); else @@ -2323,7 +2323,7 @@ update_reader_status_file (int set_card_removed_flag) (status & 2)? "PRESENT": "NOCARD"); args[8] = NULL; - fname = make_filename (opt.homedir, "scd-event", NULL); + fname = make_filename (gnupg_homedir (), "scd-event", NULL); err = gnupg_spawn_process_detached (fname, args, envs); if (err && gpg_err_code (err) != GPG_ERR_ENOENT) log_error ("failed to run event handler '%s': %s\n", |