diff options
| author | Werner Koch <wk@gnupg.org> | 2020-02-20 10:03:11 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-02-20 11:13:32 +0100 |
| commit | 0e8f6e2aa98c212442001036fb5178cd6cd8af59 (patch) | |
| tree | e5e6fa4b94889eff428598e64b0d093702bc02b4 /scd/scdaemon.c | |
| parent | build: Require libgpg-error 1.38 (diff) | |
| download | gnupg2-0e8f6e2aa98c212442001036fb5178cd6cd8af59.tar.xz gnupg2-0e8f6e2aa98c212442001036fb5178cd6cd8af59.zip | |
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 <wk@gnupg.org>
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index e64bb004e..507266532 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -19,6 +19,9 @@ */ #include <config.h> +/* 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 <stdio.h> #include <stdlib.h> @@ -45,6 +48,7 @@ #include <assuan.h> /* malloc hooks */ +#include "../common/argparse.h" /* temporary hack. */ #include "../common/i18n.h" #include "../common/sysutils.h" #include "iso7816.h" |