diff options
| author | Marcus Brinkmann <[email protected]> | 2007-06-18 20:15:01 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-06-18 20:15:01 +0000 |
| commit | e47321829dde8fb24d63b42d20047db8028ff227 (patch) | |
| tree | ef177e4395132ffa15688d8f0bf593823b9a97c3 /scd | |
| parent | 2007-06-18 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-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 'scd')
| -rw-r--r-- | scd/ChangeLog | 6 | ||||
| -rw-r--r-- | scd/scdaemon.c | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index ad517f12a..0f2b59696 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2007-06-18 Marcus Brinkmann <[email protected]> + + * scdaemon.c (main): Percent escape output of --gpgconf-list. + 2007-06-12 Werner Koch <[email protected]> * scdaemon.c (main): Replace some calls by init_common_subsystems. @@ -1635,7 +1639,7 @@ the gpg-agent. - Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright 2002, 2003, 2004, 2005, 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/scd/scdaemon.c b/scd/scdaemon.c index 4fe0918b6..4e45907db 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1,5 +1,5 @@ /* scdaemon.c - The GnuPG Smartcard Daemon - * Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2005, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -530,6 +530,8 @@ main (int argc, char **argv ) if (gpgconf_list) { /* List options and default values in the GPG Conf format. */ + char *filename = NULL; + char *filename_esc; /* The following list is taken from gnupg/tools/gpgconf-comp.c. */ /* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING @@ -548,11 +550,14 @@ 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) if (!config_filename) - config_filename = make_filename (opt.homedir, "scdaemon.conf", NULL ); + filename = make_filename (opt.homedir, "scdaemon.conf", NULL ); + filename_esc = percent_escape (filename); printf ("gpgconf-scdaemon.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT, config_filename); - + GC_OPT_FLAG_DEFAULT, filename_esc); + xfree (filename_esc); + xfree (filename); + printf ("verbose:%lu:\n" "quiet:%lu:\n" "debug-level:%lu:\"none:\n" |