GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Use gpgrt_argparse instead of argsparse.c

Browse Source 
* src/gpgme-json.c: Remove header argparse.h.  Define
GPGRT_ENABLE_ARGPARSE_MACROS.
(interactive_repl): Replace strusage by gpgrt_strusage.
(my_strusage): Add SPDX level.
(main): Switch to gpgrt_argparse stuff but keep very limited
functionality when building with an older libgpg-error.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-03-21 19:26:03 +01:00
parent 6073789a6d
commit e14f1f687f
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@ -102,10 +102,10 @@ AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@
gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h
gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
gpgme_json_SOURCES = gpgme-json.c argparse.c argparse.h cJSON.c cJSON.h gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h
gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS)
## We use -no-install temporary during development. # We use -no-install temporary during development.
#gpgme_json_LDFLAGS = -no-install gpgme_json_LDFLAGS = -no-install
if HAVE_W32_SYSTEM if HAVE_W32_SYSTEM

25
src/gpgme-json.c
View File

@ -36,8 +36,8 @@
#define GPGRT_ENABLE_ES_MACROS 1 #define GPGRT_ENABLE_ES_MACROS 1
#define GPGRT_ENABLE_LOG_MACROS 1 #define GPGRT_ENABLE_LOG_MACROS 1
#define GPGRT_ENABLE_ARGPARSE_MACROS 1
#include "gpgme.h" #include "gpgme.h"
#include "argparse.h"
#include "cJSON.h" #include "cJSON.h"
@ -828,8 +828,10 @@ interactive_repl (void)
int first; int first;
es_setvbuf (es_stdin, NULL, _IONBF, 0); es_setvbuf (es_stdin, NULL, _IONBF, 0);
#if GPGRT_VERSION_NUMBER >= 0x011d00 /* 1.29 */
es_fprintf (es_stderr, "%s %s ready (enter \",help\" for help)\n", es_fprintf (es_stderr, "%s %s ready (enter \",help\" for help)\n",
strusage (11), strusage (13)); gpgrt_strusage (11), gpgrt_strusage (13));
#endif
do do
{ {
es_fputs ("> ", es_stderr); es_fputs ("> ", es_stderr);
@ -1064,6 +1066,7 @@ my_strusage( int level )
switch (level) switch (level)
{ {
case 9: p = "LGPL-2.1-or-later"; break;
case 11: p = "gpgme-json"; break; case 11: p = "gpgme-json"; break;
case 13: p = PACKAGE_VERSION; break; case 13: p = PACKAGE_VERSION; break;
case 14: p = "Copyright (C) 2018 g10 Code GmbH"; break; case 14: p = "Copyright (C) 2018 g10 Code GmbH"; break;
@ -1083,24 +1086,30 @@ my_strusage( int level )
return p; return p;
} }
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
#if GPGRT_VERSION_NUMBER < 0x011d00 /* 1.29 */
fprintf (stderr, "WARNING: Old libgpg-error - using limited mode\n");
native_messaging_repl ();
#else /* This is a modern libgp-error. */
enum { CMD_DEFAULT = 0, enum { CMD_DEFAULT = 0,
CMD_INTERACTIVE = 'i', CMD_INTERACTIVE = 'i',
CMD_SINGLE = 's', CMD_SINGLE = 's',
CMD_LIBVERSION = 501 CMD_LIBVERSION = 501
} cmd = CMD_DEFAULT; } cmd = CMD_DEFAULT;
static ARGPARSE_OPTS opts[] = { static gpgrt_opt_t opts[] = {
ARGPARSE_c (CMD_INTERACTIVE, "interactive", "Interactive REPL"), ARGPARSE_c (CMD_INTERACTIVE, "interactive", "Interactive REPL"),
ARGPARSE_c (CMD_SINGLE, "single", "Single request mode"), ARGPARSE_c (CMD_SINGLE, "single", "Single request mode"),
ARGPARSE_c (CMD_LIBVERSION, "lib-version", "Show library version"), ARGPARSE_c (CMD_LIBVERSION, "lib-version", "Show library version"),
ARGPARSE_end() ARGPARSE_end()
}; };
ARGPARSE_ARGS pargs = { &argc, &argv, 0 }; gpgrt_argparse_t pargs = { &argc, &argv};
set_strusage (my_strusage); gpgrt_set_strusage (my_strusage);
#ifdef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
@ -1113,7 +1122,7 @@ main (int argc, char *argv[])
gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
#endif #endif
while (arg_parse (&pargs, opts)) while (gpgrt_argparse (NULL, &pargs, opts))
{ {
switch (pargs.r_opt) switch (pargs.r_opt)
{ {
@ -1130,6 +1139,7 @@ main (int argc, char *argv[])
break; break;
} }
} }
gpgrt_argparse (NULL, &pargs, NULL);
switch (cmd) switch (cmd)
{ {
@ -1153,5 +1163,6 @@ main (int argc, char *argv[])
break; break;
} }
#endif /* This is a modern libgp-error. */
return 0; return 0;
} }