From 0e8f6e2aa98c212442001036fb5178cd6cd8af59 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 20 Feb 2020 10:03:11 +0100 Subject: gpg: Use gpgrt's new option parser to provide a global conf file. * common/util.h: Remove argparse.h. * common/argparse.c: Undef GPGRT_ENABLE_ARGPARSE_MACROS. * configure.ac (GPGRT_ENABLE_ARGPARSE_MACROS): Define. * agent/gpg-agent.c: Undef GPGRT_ENABLE_ARGPARSE_MACROS and include argparse.h. Do this also for all main modules which use our option parser except for gpg. Replace calls to strusage by calls to gpgrt_strusage everywhere. * g10/gpg.c (opts): Change type to gpgrt_opt_t. Flag oOptions and oNoOptions with ARGPARSE_conffile and ARGPARSE_no_conffile. (main): Change type of pargs to gpgrt_argparse_t. Rework the option parser to make use of the new gpgrt_argparser. -- This is not yet finished but a make check works. gpg has the most complex and oldest option handling and thus this is the first migration target. SE-Linux checks and version-ed config files are missing and will be added later. GnuPG-bug-id: 4788 Signed-off-by: Werner Koch --- kbx/kbxutil.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kbx/kbxutil.c') diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 35f92ab6e..7769b834e 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -18,6 +18,9 @@ */ #include +/* We don't want to have the macros from gpgrt here until we have + * completely replaced this module by the one from gpgrt. */ +#undef GPGRT_ENABLE_ARGPARSE_MACROS #include #include #include @@ -37,6 +40,7 @@ #include "keybox-defs.h" #include "../common/init.h" #include +#include "../common/argparse.h" /* temporary hack. */ enum cmd_and_opt_values { -- cgit v1.2.3