diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-check-pattern.c | 4 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 13 | ||||
| -rw-r--r-- | tools/symcryptrun.c | 10 |
3 files changed, 11 insertions, 16 deletions
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c index fbf30a254..37283a1d4 100644 --- a/tools/gpg-check-pattern.c +++ b/tools/gpg-check-pattern.c @@ -181,8 +181,6 @@ main (int argc, char **argv ) setup_libgcrypt_logging (); gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); - opt.homedir = default_homedir (); - pargs.argc = &argc; pargs.argv = &argv; pargs.flags= 1; /* (do not remove the args) */ @@ -191,7 +189,7 @@ main (int argc, char **argv ) switch (pargs.r_opt) { case oVerbose: opt.verbose++; break; - case oHomedir: opt.homedir = pargs.r.ret_str; break; + case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break; case oCheck: opt.checkonly = 1; break; case oNull: opt.null = 1; break; diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 2e00b8f7b..eb8b51f6b 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -209,7 +209,7 @@ my_strusage( int level ) "Connect to a running agent and send commands\n"); break; case 31: p = "\nHome: "; break; - case 32: p = opt.homedir; break; + case 32: p = gnupg_homedir (); break; case 33: p = "\n"; break; default: p = NULL; break; @@ -555,7 +555,7 @@ get_var_ext (const char *name) log_error ("getcwd failed: %s\n", strerror (errno)); } else if (!strcmp (s, "homedir")) - result = make_filename (opt.homedir, NULL); + result = make_filename (gnupg_homedir (), NULL); else if (!strcmp (s, "sysconfdir")) result = xstrdup (gnupg_sysconfdir ()); else if (!strcmp (s, "bindir")) @@ -1181,7 +1181,6 @@ main (int argc, char **argv) assuan_set_gpg_err_source (0); - opt.homedir = default_homedir (); opt.autostart = 1; opt.connect_flags = 1; @@ -1196,7 +1195,7 @@ main (int argc, char **argv) case oQuiet: opt.quiet = 1; break; case oVerbose: opt.verbose++; break; case oNoVerbose: opt.verbose = 0; break; - case oHomedir: opt.homedir = pargs.r.ret_str; break; + case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break; case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break; case oNoAutostart: opt.autostart = 0; break; @@ -1225,7 +1224,7 @@ main (int argc, char **argv) in particular handy on Windows. */ if (opt.use_uiserver) { - opt.raw_socket = make_absfilename (opt.homedir, "S.uiserver", NULL); + opt.raw_socket = make_absfilename (gnupg_homedir (), "S.uiserver", NULL); } /* Print a warning if an argument looks like an option. */ @@ -2209,7 +2208,7 @@ start_agent (void) if (opt.use_dirmngr) err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT, - opt.homedir, + gnupg_homedir (), opt.dirmngr_program, opt.autostart, !opt.quiet, 0, @@ -2217,7 +2216,7 @@ start_agent (void) else err = start_new_gpg_agent (&ctx, GPG_ERR_SOURCE_DEFAULT, - opt.homedir, + gnupg_homedir (), opt.agent_program, NULL, NULL, session_env, diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c index 4b90cd267..49c17c511 100644 --- a/tools/symcryptrun.c +++ b/tools/symcryptrun.c @@ -214,7 +214,7 @@ my_strusage (int level) "Call a simple symmetric encryption tool\n"); break; case 31: p = "\nHome: "; break; - case 32: p = opt.homedir; break; + case 32: p = gnupg_homedir (); break; case 33: p = "\n"; break; default: p = NULL; break; @@ -896,8 +896,6 @@ main (int argc, char **argv) i18n_init(); init_common_subsystems (&argc, &argv); - opt.homedir = default_homedir (); - /* Check whether we have a config file given on the commandline */ orig_argc = argc; orig_argv = argv; @@ -915,11 +913,11 @@ main (int argc, char **argv) else if (pargs.r_opt == oNoOptions) default_config = 0; /* --no-options */ else if (pargs.r_opt == oHomedir) - opt.homedir = pargs.r.ret_str; + gnupg_set_homedir (pargs.r.ret_str); } if (default_config) - configname = make_filename (opt.homedir, "symcryptrun.conf", NULL ); + configname = make_filename (gnupg_homedir (), "symcryptrun.conf", NULL ); argc = orig_argc; argv = orig_argv; @@ -1010,7 +1008,7 @@ main (int argc, char **argv) /* Tell simple-pwquery about the the standard socket name. */ { - char *tmp = make_filename (opt.homedir, GPG_AGENT_SOCK_NAME, NULL); + char *tmp = make_filename (gnupg_homedir (), GPG_AGENT_SOCK_NAME, NULL); simple_pw_set_socket (tmp); xfree (tmp); } |