[svn] dirmngr - r268 - trunk/src

[svn author marcus]

Author: marcus
Date: 2007-09-12 23:04:02 +0200 (Wed, 12 Sep 2007)
New Revision: 268

Modified:
   trunk/src/ChangeLog
   trunk/src/dirmngr.c
Log:
2007-09-12  Marcus Brinkmann  <marcus at g10code.de>

	* dirmngr.c (main): Percent escape pathnames in --gpgconf-list output.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-09-04 07:42:42 UTC (rev 267)
+++ trunk/src/ChangeLog	2007-09-12 21:04:02 UTC (rev 268)
@@ -1,3 +1,7 @@
+2007-09-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* dirmngr.c (main): Percent escape pathnames in --gpgconf-list output.
+
 2007-08-27  Moritz Schulte  <moritz at g10code.com>
 
 	* src/Makefile.am (AM_CPPFLAGS): Define DIRMNGR_SOCKETDIR based on

Modified: trunk/src/dirmngr.c
===================================================================
--- trunk/src/dirmngr.c	2007-09-04 07:42:42 UTC (rev 267)
+++ trunk/src/dirmngr.c	2007-09-12 21:04:02 UTC (rev 268)
@@ -1140,6 +1140,8 @@
   else if (cmd == aGPGConfList)
     {
       char *filename;
+      char *filename_esc;
+
       /* List options and default values in the GPG Conf format.  */
 
 /* The following list is taken from gnupg/tools/gpgconf-comp.c.  */
@@ -1162,8 +1164,10 @@
         opt.config_filename = make_filename (opt.homedir,
                                              "dirmngr.conf", NULL );
 
+      filename = percent_escape (opt.config_filename, NULL);
       printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
-              GC_OPT_FLAG_DEFAULT, opt.config_filename);
+              GC_OPT_FLAG_DEFAULT, filename);
+      xfree (filename);
 
       printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE);
       printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE);
@@ -1181,7 +1185,10 @@
                                 opt.system_daemon?
                                 "ldapservers.conf":"dirmngr_ldapservers.conf",
                                 NULL);
-      printf ("ldapserverlist-file:%lu:\"%s\n", GC_OPT_FLAG_DEFAULT, filename);
+      filename_esc = percent_escape (filename, NULL);
+      printf ("ldapserverlist-file:%lu:\"%s\n", GC_OPT_FLAG_DEFAULT,
+	      filename_esc);
+      xfree (filename_esc);
       xfree (filename);
 
       printf ("ldaptimeout:%lu:%u\n",