From 22a7ef01aa2c0eb77bcc40174d09104acc35cab1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 7 Jun 2016 10:59:46 +0200 Subject: 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 --- g10/keyedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keyedit.c') diff --git a/g10/keyedit.c b/g10/keyedit.c index e9ec7e2f4..aa62cc145 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2428,7 +2428,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, else if (*arg_string == '~') fname = make_filename (arg_string, NULL); else - fname = make_filename (opt.homedir, arg_string, NULL); + fname = make_filename (gnupg_homedir (), arg_string, NULL); /* Open that file. */ a = iobuf_open (fname); -- cgit v1.2.3