aboutsummaryrefslogtreecommitdiffstats
path: root/src/gpgme.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-01-06 16:16:52 +0000
committerWerner Koch <[email protected]>2014-01-06 16:16:52 +0000
commit6564e5e78e8c6e5a120675a5699b5b75248cfbc7 (patch)
treef60419297debdcd94c12f9c05dc7918b759c2200 /src/gpgme.c
parentLocate engine names only at runtime and prefer GnuPG-2. (diff)
downloadgpgme-6564e5e78e8c6e5a120675a5699b5b75248cfbc7.tar.gz
gpgme-6564e5e78e8c6e5a120675a5699b5b75248cfbc7.zip
Add global flags disable-gpgconf, gpgconf-name, and gpg-name.
* src/gpgme.c (gpgme_set_global_flag): Add names "disable-gpgconf", "gpgconf-name", and "gpg-name". * src/dirinfo.c (_gpgme_dirinfo_disable_gpgconf): New. (get_gpgconf_item): Minor debug info change. * src/posix-util.c (default_gpg_name, default_gpgconf_name): Add vars. (_gpgme_set_default_gpg_name): New. (_gpgme_set_default_gpgconf_name): New. (_gpgme_get_gpg_path, _gpgme_get_gpgconf_path): Use new vars. (walk_path): Add debug output on failure. * src/w32-util.c (default_gpg_name, default_gpgconf_name): Add vars. (replace_slashes): New. (get_basename): New. (_gpgme_set_default_gpg_name): New. (_gpgme_set_default_gpgconf_name): New. (_gpgme_get_gpg_path, _gpgme_get_gpgconf_path): Use new vars. * tests/t-engine-info.c (main): Add --verbose and --set-global-flag options. -- Note that the Windows part has not been tested.
Diffstat (limited to '')
-rw-r--r--src/gpgme.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gpgme.c b/src/gpgme.c
index a8de64b4..4a8afa96 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -37,6 +37,7 @@
#include "wait.h"
#include "debug.h"
#include "priv-io.h"
+#include "sys-util.h"
/* The default locale. */
@@ -65,6 +66,15 @@ gpgme_set_global_flag (const char *name, const char *value)
return -1;
else if (!strcmp (name, "debug"))
return _gpgme_debug_set_debug_envvar (value);
+ else if (!strcmp (name, "disable-gpgconf"))
+ {
+ _gpgme_dirinfo_disable_gpgconf ();
+ return 0;
+ }
+ else if (!strcmp (name, "gpgconf-name"))
+ return _gpgme_set_default_gpgconf_name (value);
+ else if (!strcmp (name, "gpg-name"))
+ return _gpgme_set_default_gpg_name (value);
else
return -1;
}