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. --- sm/ChangeLog | 6 +++++- sm/gpgsm.c | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'sm') diff --git a/sm/ChangeLog b/sm/ChangeLog index 2833c9f6b..c5d342bd2 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2007-06-18 Marcus Brinkmann + + * gpgsm.c (main): Percent escape output of --gpgconf-list. + 2007-06-14 Werner Koch * call-agent.c (start_agent): Use gnupg_module_name. @@ -1931,7 +1935,7 @@ Copyright 2001, 2002, 2003, 2004, 2005, - 2006 Free Software Foundation, Inc. + 2006, 2007 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 0136680a8..11b759b65 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1,6 +1,6 @@ /* gpgsm.c - GnuPG for S/MIME * Copyright (C) 2001, 2002, 2003, 2004, 2005, - * 2006 Free Software Foundation, Inc. + * 2006, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1393,9 +1393,12 @@ main ( int argc, char **argv) a default, which is described by the value of the ARGDEF field. */ #define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6) + char *config_filename_esc = percent_escape (opt.config_filename); + printf ("gpgconf-gpgsm.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT, opt.config_filename); - + GC_OPT_FLAG_DEFAULT, config_filename_esc); + xfree (config_filename_esc); + printf ("verbose:%lu:\n" "quiet:%lu:\n" "debug-level:%lu:\"none:\n" -- cgit v1.2.3