From e47321829dde8fb24d63b42d20047db8028ff227 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 18 Jun 2007 20:15:01 +0000 Subject: jnlib/ 2007-06-18 Marcus Brinkmann * stringhelp.h (percent_escape): New prototype. * stringhelp.c (percent_escape): New function. agent/ 2007-06-18 Marcus Brinkmann * gpg-agent.c (main): Percent escape pathname in --gpgconf-list output. g10/ 2007-06-18 Marcus Brinkmann * gpg.c (gpgconf_list): Percent escape output of --gpgconf-list. scdaemon/ 2007-06-18 Marcus Brinkmann * scdaemon.c (main): Percent escape output of --gpgconf-list. sm/ 2007-06-18 Marcus Brinkmann * gpgsm.c (main): Percent escape output of --gpgconf-list. --- g10/ChangeLog | 4 ++++ g10/gpg.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'g10') diff --git a/g10/ChangeLog b/g10/ChangeLog index d87d98ec3..5e0a29062 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2007-06-18 Marcus Brinkmann + + * gpg.c (gpgconf_list): Percent escape output of --gpgconf-list. + 2007-06-14 Werner Koch * call-agent.c (start_agent): Use gnupg_module_name. diff --git a/g10/gpg.c b/g10/gpg.c index b6776de59..1e202f681 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -1456,16 +1456,20 @@ list_config(char *items) static void gpgconf_list (const char *configfile) { + char *configfile_esc = percent_escape (configfile); + /* The following definitions are taken from gnupg/tools/gpgconf-comp.c. */ #define GC_OPT_FLAG_NONE 0UL #define GC_OPT_FLAG_DEFAULT (1UL << 4) printf ("gpgconf-gpg.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT,configfile?configfile:"/dev/null"); + GC_OPT_FLAG_DEFAULT, configfile_esc ? configfile_esc : "/dev/null"); printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE); printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE); printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE); printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE); + + xfree (configfile_esc); } -- cgit v1.2.3