diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 6 |
2 files changed, 9 insertions, 1 deletions
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 <[email protected]> + + * gpg.c (gpgconf_list): Percent escape output of --gpgconf-list. + 2007-06-14 Werner Koch <[email protected]> * call-agent.c (start_agent): Use gnupg_module_name. @@ -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); } |