aboutsummaryrefslogtreecommitdiffstats
path: root/src/util.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-02-21 10:22:45 +0000
committerWerner Koch <[email protected]>2014-02-21 10:22:45 +0000
commit651d9e1c6bc1cab248024c3850ef64698247588f (patch)
tree1ef03ae1f09046eae7ae5c31daa48b7394c157b1 /src/util.h
parentFix type inconsistency between gpgme.h and gpgme.c. (diff)
downloadgpgme-651d9e1c6bc1cab248024c3850ef64698247588f.tar.gz
gpgme-651d9e1c6bc1cab248024c3850ef64698247588f.zip
Always pass correct name to argv[0]. Ignore GPG_AGENT_INFO for gpg2.
* src/dirinfo.c (WANT_GPG_ONE_MODE): New. (struct dirinfo): Add field "gpg_one_mode". (get_gpgconf_item): Set that field and return it if requested. (_gpgme_in_gpg_one_mode): New. * src/engine-gpg.c (build_argv): Check GPG_AGENT_INFO only in gpg-1 mode. * src/dirinfo.c (_gpgme_get_basename): New. * src/engine-g13.c (g13_new): Take argv[0] from the pgmname. * src/engine-gpgsm.c (gpgsm_new): Ditto. * src/engine-gpg.c (build_argv): Ditto. Add arg PGMNAME. (start): Pass PGMNAME to buildargv.
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util.h b/src/util.h
index c0934e16..4b46ea0b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -60,6 +60,9 @@ const char *_gpgme_get_default_gpgsm_name (void);
const char *_gpgme_get_default_g13_name (void);
const char *_gpgme_get_default_gpgconf_name (void);
const char *_gpgme_get_default_uisrv_socket (void);
+int _gpgme_in_gpg_one_mode (void);
+
+const char *_gpgme_get_basename (const char *name);