2004-03-23 Marcus Brinkmann <marcus@g10code.de>

* gpg-agent.c (main): For now, always print the default config
	file name for --gpgconf-list.
This commit is contained in:
Marcus Brinkmann 2004-03-23 12:21:29 +00:00
parent d714e81e58
commit 6c80bd0b49
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2004-03-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (main): For now, always print the default config
file name for --gpgconf-list.
2004-03-17 Werner Koch <wk@gnupg.org>
* gpg-agent.c (main) <gpgconf>: Fixed default value quoting.

View File

@ -587,7 +587,10 @@ main (int argc, char **argv )
}
if (gpgconf_list)
{ /* List options and default values in the GPG Conf format. */
{
char *filename;
/* List options and default values in the GPG Conf format. */
/* The following list is taken from gnupg/tools/gpgconf-comp.c. */
/* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING
@ -606,9 +609,10 @@ 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)
filename = make_filename (opt.homedir, "gpg-agent.conf", NULL );
printf ("gpgconf-gpg-agent.conf:%lu:\"%s\n",
GC_OPT_FLAG_DEFAULT,
config_filename?config_filename:"/dev/null");
GC_OPT_FLAG_DEFAULT, filename);
xfree (filename);
printf ("verbose:%lu:\n"
"quiet:%lu:\n"