* 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().

1 files changed, 2 insertions, 9 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 039074f6b..e02ad0d13 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1264,16 +1264,9 @@ main( int argc, char **argv )
     opt.mangle_dos_filenames = 1;
     opt.use_agent = 1;
 
-#if defined (_WIN32)
-    set_homedir ( read_w32_registry_string( NULL,
-                                    "Software\\GNU\\GnuPG", "HomeDir" ));
-#else
-    set_homedir ( getenv("GNUPGHOME") );
-#endif
-    if( !*opt.homedir )
-	set_homedir ( GNUPG_DEFAULT_HOMEDIR );
+    set_homedir ( default_homedir () );
 
-    /* check whether we have a config file on the commandline */
+    /* Check whether we have a config file on the commandline */
     orig_argc = argc;
     orig_argv = argv;
     pargs.argc = &argc;