aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2007-06-18 20:15:01 +0000
committerMarcus Brinkmann <[email protected]>2007-06-18 20:15:01 +0000
commite47321829dde8fb24d63b42d20047db8028ff227 (patch)
treeef177e4395132ffa15688d8f0bf593823b9a97c3 /sm
parent2007-06-18 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-e47321829dde8fb24d63b42d20047db8028ff227.tar.gz
gnupg-e47321829dde8fb24d63b42d20047db8028ff227.zip
jnlib/
2007-06-18 Marcus Brinkmann <[email protected]> * stringhelp.h (percent_escape): New prototype. * stringhelp.c (percent_escape): New function. agent/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpg-agent.c (main): Percent escape pathname in --gpgconf-list output. g10/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpg.c (gpgconf_list): Percent escape output of --gpgconf-list. scdaemon/ 2007-06-18 Marcus Brinkmann <[email protected]> * scdaemon.c (main): Percent escape output of --gpgconf-list. sm/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpgsm.c (main): Percent escape output of --gpgconf-list.
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog6
-rw-r--r--sm/gpgsm.c9
2 files changed, 11 insertions, 4 deletions
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 <[email protected]>
+
+ * gpgsm.c (main): Percent escape output of --gpgconf-list.
+
2007-06-14 Werner Koch <[email protected]>
* 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"