mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* gpg-agent.c (main): Use default_homedir().
* protect-tool.c (main): Ditto. * signal.c (got_fatal_signal, got_usr_signal) (got_fatal_signal) [DOSISH]: Don't build. * simple-gettext.c: Include sysutils.h * homedir.c: New. * Makefile.am (libcommon_a_SOURCES): Add it. (EXTRA_DIST): Removed mkerror and mkerrtok. * gpgv.c, g10.c (main): Use default_hoemdir (). * scdaemon.c (main): Use default_homedir(). * gpgsm.c (main): Use default_homedir().
This commit is contained in:
parent
581f5ddb17
commit
878cf20766
18 changed files with 102 additions and 66 deletions
11
sm/gpgsm.c
11
sm/gpgsm.c
|
@ -756,16 +756,9 @@ main ( int argc, char **argv)
|
|||
|
||||
opt.def_cipher_algoid = "1.2.840.113549.3.7"; /*des-EDE3-CBC*/
|
||||
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
opt.homedir = read_w32_registry_string ( NULL,
|
||||
"Software\\GNU\\GnuPG", "HomeDir" );
|
||||
#else
|
||||
opt.homedir = getenv ("GNUPGHOME");
|
||||
#endif
|
||||
if (!opt.homedir || !*opt.homedir )
|
||||
opt.homedir = GNUPG_DEFAULT_HOMEDIR;
|
||||
opt.homedir = default_homedir ();
|
||||
|
||||
/* first check whether we have a config file on the commandline */
|
||||
/* First check whether we have a config file on the commandline */
|
||||
orig_argc = argc;
|
||||
orig_argv = argv;
|
||||
pargs.argc = &argc;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue