From 9ff72e4e7e4f56c241a525479a94ed4c95efc23f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 1 Aug 2013 11:20:48 +0200 Subject: w32: Add code to support a portable use of GnuPG. * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New. (check_portable_app) [W32]: New. (standard_homedir, default_homedir) [W32]: Support the portable flag. (w32_rootdir, w32_commondir) [W32]: Ditto. (gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto. * common/logging.h (JNLIB_LOG_NO_REGISTRY): New. * common/logging.c (no_registry): New variable. (log_set_prefix, log_get_prefix): Set/get that variable. (do_logv): Do not check the registry if that variable is set. -- Beware: This code has not been tested because it is not yet possible to build GnuPG 2.1 for Windows. However, the code will be the base for an implementation in 2.0. A portable use of GnuPG under Windows means that GnuPG uses a home directory depending on the location of the actual binary. No registry variables are considered. The portable mode is enabled if in the installation directory of the the binary "gpgconf.exe" and a file "gpgconf.ctl" are found. The latter file is empty or consists only of empty or '#' comment lines. Signed-off-by: Werner Koch --- common/logging.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index 73b0dbe59..f78df9141 100644 --- a/common/logging.c +++ b/common/logging.c @@ -96,6 +96,9 @@ static char prefix_buffer[80]; static int with_time; static int with_prefix; static int with_pid; +#ifdef HAVE_W32_SYSTEM +static int no_registry; +#endif static int (*get_pid_suffix_cb)(unsigned long *r_value); static int running_detached; static int force_prefixes; @@ -561,6 +564,9 @@ log_set_prefix (const char *text, unsigned int flags) with_time = (flags & JNLIB_LOG_WITH_TIME); with_pid = (flags & JNLIB_LOG_WITH_PID); running_detached = (flags & JNLIB_LOG_RUN_DETACHED); +#ifdef HAVE_W32_SYSTEM + no_registry = (flags & JNLIB_LOG_NO_REGISTRY); +#endif } @@ -578,6 +584,10 @@ log_get_prefix (unsigned int *flags) *flags |= JNLIB_LOG_WITH_PID; if (running_detached) *flags |= JNLIB_LOG_RUN_DETACHED; +#ifdef HAVE_W32_SYSTEM + if (no_registry) + *flags |= JNLIB_LOG_NO_REGISTRY; +#endif } return prefix_buffer; } @@ -624,8 +634,10 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr) #ifdef HAVE_W32_SYSTEM char *tmp; - tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG", - "DefaultLogFile"); + tmp = (no_registry + ? NULL + : read_w32_registry_string (NULL, "Software\\GNU\\GnuPG", + "DefaultLogFile")); log_set_file (tmp && *tmp? tmp : NULL); jnlib_free (tmp); #else -- cgit