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 /sm/gpgsm.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 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 709263cba..935d50474 100644 --- a/sm/gpgsm.c +++ b/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; |