GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w32: Look for gpgconf in the new GnuPG 2.1 install dir.

Browse Source 
* src/w32-util.c (_gpgme_get_gpgconf_path): Try another location of
gpgconf.exe.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-08-24 19:59:43 +02:00
parent 06d6fd8ca0
commit a7dbab23ea
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/w32-util.c
View File

@ -522,7 +522,16 @@ _gpgme_get_gpgconf_path (void)
gpgconf = find_program_in_dir (inst_dir, name); gpgconf = find_program_in_dir (inst_dir, name);
} }
/* 2. Try to find gpgconf.exe using that ancient registry key. */ /* 2. Try to find gpgconf.exe from GnuPG >= 2.1 below CSIDL_PROGRAM_FILES. */
if (!gpgconf)
{
const char *name2 = (default_gpgconf_name ? default_gpgconf_name
/**/ : "GnuPG\\bin\\gpgconf.exe");
gpgconf = find_program_at_standard_place (name2);
}
/* 3. Try to find gpgconf.exe using that ancient registry key. This
should eventually be removed. */
if (!gpgconf) if (!gpgconf)
{ {
char *dir; char *dir;
@ -537,15 +546,13 @@ _gpgme_get_gpgconf_path (void)
} }
} }
/* 3. Try to find gpgconf.exe below CSIDL_PROGRAM_FILES. */ /* 4. Try to find gpgconf.exe from Gpg4win below CSIDL_PROGRAM_FILES. */
if (!gpgconf) if (!gpgconf)
{ {
name = (default_gpgconf_name ? default_gpgconf_name gpgconf = find_program_at_standard_place ("GNU\\GnuPG\\gpgconf.exe");
/**/ : "GNU\\GnuPG\\gpgconf.exe");
gpgconf = find_program_at_standard_place (name);
} }
/* 4. Print a debug message if not found. */ /* 5. Print a debug message if not found. */
if (!gpgconf) if (!gpgconf)
_gpgme_debug (DEBUG_ENGINE, "_gpgme_get_gpgconf_path: '%s' not found",name); _gpgme_debug (DEBUG_ENGINE, "_gpgme_get_gpgconf_path: '%s' not found",name);