diff options
author | Werner Koch <[email protected]> | 2024-03-21 16:41:10 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2024-03-21 16:41:10 +0000 |
commit | a0bfbdaaa2d91cda9c6dbf97462b6ac0a112af0e (patch) | |
tree | bdc4eee5e9843d6421c0daccd1d55c7e5efc7a19 /common/util.h | |
parent | common: Use a common gpgconf.ctl parser for Unix and Windows. (diff) | |
download | gnupg-a0bfbdaaa2d91cda9c6dbf97462b6ac0a112af0e.tar.gz gnupg-a0bfbdaaa2d91cda9c6dbf97462b6ac0a112af0e.zip |
Allow installation with a gpgconf.ctl changed homedir.
* common/homedir.c (gpgconf_ctl): Add field "gnupg".
(parse_gpgconf_ctl): Support keyword "gnupg".
(my_gnupg_dirname): New.
(my_fixed_default_homedir): New.
(gnupg_registry_dir): New.
(standard_homedir): Use my_gnupg_dirname and my_fixed_default_homedir.
(default_homedir): Use gnupg_registry_dir and
my_fixed_default_homedir.
(_gnupg_socketdir_internal): Use my_gnupg_dirname. Increase size of
prefixbuffer.
(gnupg_sysconfdir): Use my_gnupg_dirname.
* tools/gpgconf.c (list_dirs): Use gnupg_registry_dir.
(show_other_registry_entries): Ditto.
--
This will be useful to install versions of GnuPG VS-Desktop and GnuPG
Desktop in addition to a standard GnuPG version. Only basic tests on
Unix done; Windows testing is still outstanding.
GnuPG-bug-id: 7040
Diffstat (limited to '')
-rw-r--r-- | common/util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/util.h b/common/util.h index e2d95b1af..851b392a5 100644 --- a/common/util.h +++ b/common/util.h @@ -244,6 +244,7 @@ void gnupg_set_homedir (const char *newdir); void gnupg_maybe_make_homedir (const char *fname, int quiet); const char *gnupg_homedir (void); int gnupg_default_homedir_p (void); +const char *gnupg_registry_dir (void); const char *gnupg_daemon_rootdir (void); const char *gnupg_socketdir (void); const char *gnupg_sysconfdir (void); |