From 299cb641e6d225d27098b5d912d1f8a32408fbab Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 19 Aug 2010 11:41:43 +0000 Subject: [PATCH] Fix --check-options --- tools/ChangeLog | 8 ++++++-- tools/gpgconf.c | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tools/ChangeLog b/tools/ChangeLog index 14666479d..fd0052700 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,13 +1,17 @@ +2010-08-19 Werner Koch + + * gpgconf.c (main): Fix --check-options. + 2010-02-11 Marcus Brinkmann From 2009-09-23, 2009-11-04, 2009-11-05, 2009-12-08: - + * gpg-connect-agent.c (read_and_print_response): Add arg WITHHASH. (getinfo_pid_cb, read_and_print_response) (main): Pass true for WITHHASH for the HELP command. Update to new Assuan API. Update use of assuan_socket_connect and assuan_pipe_connect. Convert posix fd to assuan fd. - + 2010-01-10 Werner Koch * symcryptrun.c (utmp.h): Remove header; it is not used. diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 76e44670a..eb7e9c9ea 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -226,15 +226,18 @@ main (int argc, char **argv) putc ('\n', stderr); exit (1); } - gc_component_retrieve_options (idx); - if (gc_process_gpgconf_conf (NULL, 1, 0, NULL)) - exit (1); - if (cmd == aListOptions) - gc_component_list_options (idx, get_outfp (&outfp)); - else if (cmd == aChangeOptions) - gc_component_change_options (idx, stdin, get_outfp (&outfp)); - else + if (cmd == aCheckOptions) gc_component_check_options (idx, get_outfp (&outfp), NULL); + else + { + gc_component_retrieve_options (idx); + if (gc_process_gpgconf_conf (NULL, 1, 0, NULL)) + exit (1); + if (cmd == aListOptions) + gc_component_list_options (idx, get_outfp (&outfp)); + else if (cmd == aChangeOptions) + gc_component_change_options (idx, stdin, get_outfp (&outfp)); + } } break;