diff options
| author | Werner Koch <[email protected]> | 2004-12-21 10:03:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-12-21 10:03:00 +0000 |
| commit | 878cf2076633742ad5f4e4008059b0fc8d776d37 (patch) | |
| tree | 07e7c9d7bab4f56a69d5496cede7ab6a3f36397a /agent/protect-tool.c | |
| parent | * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all (diff) | |
| download | gnupg-878cf2076633742ad5f4e4008059b0fc8d776d37.tar.gz gnupg-878cf2076633742ad5f4e4008059b0fc8d776d37.zip | |
* 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().
Diffstat (limited to '')
| -rw-r--r-- | agent/protect-tool.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/agent/protect-tool.c b/agent/protect-tool.c index 43dd67eea..ee0276a43 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -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; |