aboutsummaryrefslogtreecommitdiffstats
path: root/g13
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-02-20 09:03:11 +0000
committerWerner Koch <[email protected]>2020-02-20 10:13:32 +0000
commit0e8f6e2aa98c212442001036fb5178cd6cd8af59 (patch)
treee5e6fa4b94889eff428598e64b0d093702bc02b4 /g13
parentbuild: Require libgpg-error 1.38 (diff)
downloadgnupg-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 'g13')
-rw-r--r--g13/g13-syshelp.c4
-rw-r--r--g13/g13.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c
index 4ce74ee4c..205456568 100644
--- a/g13/g13-syshelp.c
+++ b/g13/g13-syshelp.c
@@ -18,6 +18,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>
#include <string.h>
@@ -42,6 +45,7 @@
#include "../common/asshelp.h"
#include "../common/init.h"
#include "keyblob.h"
+#include "../common/argparse.h" /* temporary hack. */
enum cmd_and_opt_values {
diff --git a/g13/g13.c b/g13/g13.c
index 6265b9f24..385ba0f9b 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -18,6 +18,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>
#include <string.h>
@@ -47,6 +50,7 @@
#include "mountinfo.h"
#include "backend.h"
#include "call-syshelp.h"
+#include "../common/argparse.h" /* temporary hack. */
enum cmd_and_opt_values {