From 651d9e1c6bc1cab248024c3850ef64698247588f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 21 Feb 2014 11:22:45 +0100 Subject: 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. --- src/util.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/util.h') 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); -- cgit v1.2.3