1
0
Fork 0
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:
Werner Koch 2004-12-21 10:03:00 +00:00
parent 581f5ddb17
commit 878cf20766
18 changed files with 102 additions and 66 deletions

View file

@ -84,7 +84,7 @@ struct rsa_secret_key_s
};
static char *opt_homedir;
static const char *opt_homedir;
static int opt_armor;
static int opt_store;
static int opt_force;
@ -1067,14 +1067,7 @@ main (int argc, char **argv )
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
opt_homedir = getenv ("GNUPGHOME");
#ifdef HAVE_W32_SYSTEM
if (!opt_homedir || !*opt_homedir)
opt_homedir = read_w32_registry_string (NULL,
"Software\\GNU\\GnuPG", "HomeDir");
#endif /*HAVE_W32_SYSTEM*/
if (!opt_homedir || !*opt_homedir)
opt_homedir = GNUPG_DEFAULT_HOMEDIR;
opt_homedir = default_homedir ();
pargs.argc = &argc;