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 --- g10/call-keyboxd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/call-keyboxd.c') diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c index d7d9e2da4..181f33fed 100644 --- a/g10/call-keyboxd.c +++ b/g10/call-keyboxd.c @@ -144,7 +144,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername) { gpg_error_t err; char *serverversion; - const char *myversion = strusage (13); + const char *myversion = gpgrt_strusage (13); err = get_assuan_server_version (ctx, 0, &serverversion); if (err) -- cgit v1.2.3