diff options
| author | Werner Koch <[email protected]> | 2020-02-20 09:03:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-02-20 10:13:32 +0000 |
| commit | 0e8f6e2aa98c212442001036fb5178cd6cd8af59 (patch) | |
| tree | e5e6fa4b94889eff428598e64b0d093702bc02b4 /common/util.h | |
| parent | build: Require libgpg-error 1.38 (diff) | |
| download | gnupg-0e8f6e2aa98c212442001036fb5178cd6cd8af59.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/util.h b/common/util.h index 756f32c03..e1d9fa6fd 100644 --- a/common/util.h +++ b/common/util.h @@ -62,7 +62,6 @@ /* Get all the stuff from jnlib. */ #include "../common/logging.h" -#include "../common/argparse.h" #include "../common/stringhelp.h" #include "../common/mischelp.h" #include "../common/strlist.h" |