security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Use gpgrt's new option parser to provide a global conf file.

Browse source 
* 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>
This commit is contained in:
Werner Koch 2020-02-20 10:03:11 +01:00
parent ccdf988b40
commit 0e8f6e2aa9
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
32 changed files with 268 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/gpgscm/main.c
View file

@ -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 <assert.h>
#include <ctype.h>
@ -48,6 +51,7 @@
#include "../../common/strlist.h"
#include "../../common/sysutils.h"
#include "../../common/util.h"
#include "../common/argparse.h" /* temporary hack. */
/* The TinyScheme banner. Unfortunately, it isn't in the header
file. */