diff options
Diffstat (limited to 'src/gpgme-tool.c')
| -rw-r--r-- | src/gpgme-tool.c | 611 |
1 files changed, 98 insertions, 513 deletions
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index e5e5707..fb158f1 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -32,12 +32,10 @@ #ifdef HAVE_LOCALE_H #include <locale.h> #endif -#ifdef HAVE_ARGP_H -#include <argp.h> -#endif #include <assuan.h> +#include "argparse.h" #include "gpgme.h" /* GCC attributes. */ @@ -60,421 +58,6 @@ -#ifndef HAVE_ARGP_H -/* Minimal argp implementation. */ - -/* Differences to ARGP: - argp_program_version: Required. - argp_program_bug_address: Required. - argp_program_version_hook: Not supported. - argp_err_exit_status: Required. - struct argp: Children and help_filter not supported. - argp_domain: Not supported. - struct argp_option: Group not supported. Options are printed in - order given. Flags OPTION_ALIAS, OPTION_DOC and OPTION_NO_USAGE - are not supported. - argp_parse: No flags are supported (ARGP_PARSE_ARGV0, ARGP_NO_ERRS, - ARGP_NO_ARGS, ARGP_IN_ORDER, ARGP_NO_HELP, ARGP_NO_EXIT, - ARGP_LONG_ONLY, ARGP_SILENT). ARGP must not be NULL. - argp_help: Flag ARGP_HELP_LONG_ONLY not supported. - argp_state: argc, argv, next may not be modified and should not be used. */ - -extern const char *argp_program_version; -extern const char *argp_program_bug_address; -extern error_t argp_err_exit_status; - -struct argp_option -{ - const char *name; - int key; - const char *arg; -#define OPTION_ARG_OPTIONAL 0x1 -#define OPTION_HIDDEN 0x2 - int flags; - const char *doc; - int group; -}; - -struct argp; -struct argp_state -{ - const struct argp *const root_argp; - int argc; - char **argv; - int next; - unsigned flags; - unsigned arg_num; - int quoted; - void *input; - void **child_inputs; - void *hook; - char *name; - FILE *err_stream; - FILE *out_stream; - void *pstate; -}; - -#ifdef EDEADLK -# define ARGP_ERR_UNKNOWN EDEADLK /* POSIX */ -#else -# define ARGP_ERR_UNKNOWN EDEADLOCK /* *GNU/kFreebsd does not define this) */ -#endif -#define ARGP_KEY_ARG 0 -#define ARGP_KEY_ARGS 0x1000006 -#define ARGP_KEY_END 0x1000001 -#define ARGP_KEY_NO_ARGS 0x1000002 -#define ARGP_KEY_INIT 0x1000003 -#define ARGP_KEY_FINI 0x1000007 -#define ARGP_KEY_SUCCESS 0x1000004 -#define ARGP_KEY_ERROR 0x1000005 -typedef error_t (*argp_parser_t) (int key, char *arg, struct argp_state *state); - -struct argp -{ - const struct argp_option *options; - argp_parser_t parser; - const char *args_doc; - const char *doc; - - const struct argp_child *children; - char *(*help_filter) (int key, const char *text, void *input); - const char *argp_domain; -}; - -#define ARGP_HELP_USAGE ARGP_HELP_SHORT_USAGE -#define ARGP_HELP_SHORT_USAGE 0x02 -#define ARGP_HELP_SEE 0x04 -#define ARGP_HELP_LONG 0x08 -#define ARGP_HELP_PRE_DOC 0x10 -#define ARGP_HELP_POST_DOC 0x20 -#define ARGP_HELP_DOC (ARGP_HELP_PRE_DOC | ARGP_HELP_POST_DOC) -#define ARGP_HELP_BUG_ADDR 0x40 -#define ARGP_HELP_EXIT_ERR 0x100 -#define ARGP_HELP_EXIT_OK 0x200 -#define ARGP_HELP_STD_ERR (ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR) -#define ARGP_HELP_STD_USAGE \ - (ARGP_HELP_SHORT_USAGE | ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR) -#define ARGP_HELP_STD_HELP \ - (ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG | ARGP_HELP_EXIT_OK \ - | ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR) - - -void argp_error (const struct argp_state *state, - const char *fmt, ...) GT_GCC_A_PRINTF(2, 3); - - - -char * -_argp_pname (char *name) -{ - char *pname = name; - char *bname = strrchr (pname, '/'); - if (! bname) - bname = strrchr (pname, '\\'); - if (bname) - pname = bname + 1; - return pname; -} - - -void -_argp_state_help (const struct argp *argp, const struct argp_state *state, - FILE *stream, unsigned flags, char *name) -{ - if (state) - name = state->name; - - if (flags & ARGP_HELP_SHORT_USAGE) - fprintf (stream, "Usage: %s [OPTIONS...] %s\n", name, argp->args_doc); - if (flags & ARGP_HELP_SEE) - fprintf (stream, "Try `%s --help' or `%s --usage' for more information.\n", - name, name); - if (flags & ARGP_HELP_PRE_DOC) - { - char buf[1024]; - char *end; - strncpy (buf, argp->doc, sizeof (buf)); - buf[sizeof (buf) - 1] = '\0'; - end = strchr (buf, '\v'); - if (end) - *end = '\0'; - fprintf (stream, "%s\n%s", buf, buf[0] ? "\n" : ""); - } - if (flags & ARGP_HELP_LONG) - { - const struct argp_option *opt = argp->options; - while (opt->key) - { - #define NSPACES 29 - char spaces[NSPACES + 1] = " "; - int len = 0; - fprintf (stream, " "); - len += 2; - if (isascii (opt->key)) - { - fprintf (stream, "-%c", opt->key); - len += 2; - if (opt->name) - { - fprintf (stream, ", "); - len += 2; - } - } - if (opt->name) - { - fprintf (stream, "--%s", opt->name); - len += 2 + strlen (opt->name); - } - if (opt->arg && (opt->flags & OPTION_ARG_OPTIONAL)) - { - fprintf (stream, "[=%s]", opt->arg); - len += 3 + strlen (opt->arg); - } - else if (opt->arg) - { - fprintf (stream, "=%s", opt->arg); - len += 1 + strlen (opt->arg); - } - if (len >= NSPACES) - len = NSPACES - 1; - spaces[NSPACES - len] = '\0'; - fprintf (stream, "%s%s\n", spaces, opt->doc); - opt++; - } - fprintf (stream, " -?, --help Give this help list\n"); - fprintf (stream, " --usage Give a short usage " - "message\n"); - } - if (flags & ARGP_HELP_POST_DOC) - { - char buf[1024]; - char *end; - strncpy (buf, argp->doc, sizeof (buf)); - buf[sizeof (buf) - 1] = '\0'; - end = strchr (buf, '\v'); - if (end) - { - end++; - if (*end) - fprintf (stream, "\n%s\n", end); - } - fprintf (stream, "\nMandatory or optional arguments to long options are also mandatory or optional\n"); - fprintf (stream, "for any corresponding short options.\n"); - } - if (flags & ARGP_HELP_BUG_ADDR) - fprintf (stream, "\nReport bugs to %s.\n", argp_program_bug_address); - - if (flags & ARGP_HELP_EXIT_ERR) - exit (argp_err_exit_status); - if (flags & ARGP_HELP_EXIT_OK) - exit (0); -} - - -void -argp_usage (const struct argp_state *state) -{ - _argp_state_help (state->root_argp, state, state->err_stream, - ARGP_HELP_STD_USAGE, state->name); -} - - -void -argp_state_help (const struct argp_state *state, FILE *stream, unsigned flags) -{ - _argp_state_help (state->root_argp, state, stream, flags, state->name); -} - - -void -argp_error (const struct argp_state *state, const char *fmt, ...) -{ - va_list ap; - - fprintf (state->err_stream, "%s: ", state->name); - va_start (ap, fmt); - vfprintf (state->err_stream, fmt, ap); - va_end (ap); - fprintf (state->err_stream, "\n"); - argp_state_help (state, state->err_stream, ARGP_HELP_STD_ERR); - exit (argp_err_exit_status); -} - - -void -argp_help (const struct argp *argp, FILE *stream, unsigned flags, char *name) -{ - _argp_state_help (argp, NULL, stream, flags, name); -} - - -error_t -argp_parse (const struct argp *argp, int argc, - char **argv, unsigned flags, int *arg_index, void *input) -{ - int rc = 0; - struct argp_state state = { argp, argc, argv, 1, flags, 0, 0, input, - NULL, NULL, _argp_pname (argv[0]), - stderr, stdout, NULL }; - /* All non-option arguments are collected at the beginning of - &argv[1] during processing. This is a counter for their number. */ - int non_opt_args = 0; - - rc = argp->parser (ARGP_KEY_INIT, NULL, &state); - if (rc && rc != ARGP_ERR_UNKNOWN) - goto argperror; - - while (state.next < state.argc - non_opt_args) - { - int idx = state.next; - state.next++; - - if (! strcasecmp (state.argv[idx], "--")) - { - state.quoted = idx; - continue; - } - - if (state.quoted || state.argv[idx][0] != '-') - { - char *arg_saved = state.argv[idx]; - non_opt_args++; - memmove (&state.argv[idx], &state.argv[idx + 1], - (state.argc - 1 - idx) * sizeof (char *)); - state.argv[argc - 1] = arg_saved; - state.next--; - } - else if (! strcasecmp (state.argv[idx], "--help") - || !strcmp (state.argv[idx], "-?")) - { - argp_state_help (&state, state.out_stream, ARGP_HELP_STD_HELP); - } - else if (! strcasecmp (state.argv[idx], "--usage")) - { - argp_state_help (&state, state.out_stream, - ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK); - } - else if (! strcasecmp (state.argv[idx], "--version") - || !strcmp (state.argv[idx], "-V")) - { - fprintf (state.out_stream, "%s\n", argp_program_version); - exit (0); - } - else - { - /* Search for option and call parser with its KEY. */ - int key = ARGP_KEY_ARG; /* Just some dummy value. */ - const struct argp_option *opt = argp->options; - char *arg = NULL; - int found = 0; - - /* Check for --opt=value syntax. */ - arg = strchr (state.argv[idx], '='); - if (arg) - { - *arg = '\0'; - arg++; - } - - if (state.argv[idx][1] != '-') - key = state.argv[idx][1]; - - while (! found && opt->key) - { - if (key == opt->key - || (key == ARGP_KEY_ARG - && ! strcasecmp (&state.argv[idx][2], opt->name))) - { - if (arg && !opt->arg) - argp_error (&state, "Option %s does not take an argument", - state.argv[idx]); - if (opt->arg && state.next < state.argc - && state.argv[idx + 1][0] != '-') - { - arg = state.argv[idx + 1]; - state.next++; - } - if (opt->arg && !(opt->flags & OPTION_ARG_OPTIONAL)) - argp_error (&state, "Option %s requires an argument", - state.argv[idx]); - - rc = argp->parser (opt->key, arg, &state); - if (rc == ARGP_ERR_UNKNOWN) - break; - else if (rc) - goto argperror; - found = 1; - } - opt++; - } - if (! found) - argp_error (&state, "Unknown option %s", state.argv[idx]); - } - } - - while (state.next < state.argc) - { - /* Call parser for all non-option args. */ - int idx = state.next; - state.next++; - rc = argp->parser (ARGP_KEY_ARG, state.argv[idx], &state); - if (rc && rc != ARGP_ERR_UNKNOWN) - goto argperror; - if (rc == ARGP_ERR_UNKNOWN) - { - int old_next = state.next; - rc = argp->parser (ARGP_KEY_ARGS, NULL, &state); - if (rc == ARGP_ERR_UNKNOWN) - { - argp_error (&state, "Too many arguments"); - goto argperror; - } - if (! rc && state.next == old_next) - { - state.arg_num += state.argc - state.next; - state.next = state.argc; - } - } - else - state.arg_num++; - } - - if (state.arg_num == 0) - { - rc = argp->parser (ARGP_KEY_NO_ARGS, NULL, &state); - if (rc && rc != ARGP_ERR_UNKNOWN) - goto argperror; - } - if (state.next == state.argc) - { - rc = argp->parser (ARGP_KEY_END, NULL, &state); - if (rc && rc != ARGP_ERR_UNKNOWN) - goto argperror; - } - rc = argp->parser (ARGP_KEY_FINI, NULL, &state); - if (rc && rc != ARGP_ERR_UNKNOWN) - goto argperror; - - rc = 0; - argp->parser (ARGP_KEY_SUCCESS, NULL, &state); - - argperror: - if (rc) - { - argp_error (&state, "unexpected error: %s", strerror (rc)); - argp->parser (ARGP_KEY_ERROR, NULL, &state); - } - - argp->parser (ARGP_KEY_FINI, NULL, &state); - - if (arg_index) - *arg_index = state.next - 1; - - return 0; -} -#endif - - /* MEMBUF */ /* A simple implementation of a dynamic buffer. Use init_membuf() to @@ -619,7 +202,7 @@ peek_membuf (membuf_t *mb, size_t *len) /* SUPPORT. */ FILE *log_stream; -char *program_name = "gpgme-tool"; +char program_name[] = "gpgme-tool"; #define spacep(p) (*(p) == ' ' || *(p) == '\t') @@ -725,7 +308,7 @@ struct result_xml_state #define MAX_TAGS 20 int next_tag; - char *tag[MAX_TAGS]; + const char *tag[MAX_TAGS]; int had_data[MAX_TAGS]; }; @@ -754,13 +337,14 @@ result_xml_indent (struct result_xml_state *state) gpg_error_t -result_xml_tag_start (struct result_xml_state *state, char *name, ...) +result_xml_tag_start (struct result_xml_state *state, const char *name, ...) { result_xml_write_cb_t cb = state->cb; void *hook = state->hook; va_list ap; char *attr; char *attr_val; + char string_null[] = "(null)"; va_start (ap, name); @@ -791,7 +375,7 @@ result_xml_tag_start (struct result_xml_state *state, char *name, ...) attr_val = va_arg (ap, char *); if (attr_val == NULL) - attr_val = "(null)"; + attr_val = string_null; (*cb) (hook, " ", 1); (*cb) (hook, attr, strlen (attr)); @@ -908,7 +492,8 @@ result_xml_tag_end (struct result_xml_state *state) gpg_error_t -result_add_error (struct result_xml_state *state, char *name, gpg_error_t err) +result_add_error (struct result_xml_state *state, + const char *name, gpg_error_t err) { char code[20]; char msg[1024]; @@ -924,7 +509,7 @@ result_add_error (struct result_xml_state *state, char *name, gpg_error_t err) gpg_error_t result_add_pubkey_algo (struct result_xml_state *state, - char *name, gpgme_pubkey_algo_t algo) + const char *name, gpgme_pubkey_algo_t algo) { char code[20]; char msg[80]; @@ -940,10 +525,11 @@ result_add_pubkey_algo (struct result_xml_state *state, gpg_error_t result_add_hash_algo (struct result_xml_state *state, - char *name, gpgme_hash_algo_t algo) + const char *name, gpgme_hash_algo_t algo) { char code[20]; char msg[80]; + snprintf (code, sizeof (code) - 1, "0x%x", algo); snprintf (msg, sizeof (msg) - 1, "%s", gpgme_hash_algo_name (algo)); @@ -955,7 +541,8 @@ result_add_hash_algo (struct result_xml_state *state, gpg_error_t -result_add_keyid (struct result_xml_state *state, char *name, char *keyid) +result_add_keyid (struct result_xml_state *state, + const char *name, const char *keyid) { result_xml_tag_start (state, name, NULL); result_xml_tag_data (state, keyid); @@ -965,7 +552,8 @@ result_add_keyid (struct result_xml_state *state, char *name, char *keyid) gpg_error_t -result_add_fpr (struct result_xml_state *state, char *name, char *fpr) +result_add_fpr (struct result_xml_state *state, + const char *name, const char *fpr) { result_xml_tag_start (state, name, NULL); result_xml_tag_data (state, fpr); @@ -975,7 +563,7 @@ result_add_fpr (struct result_xml_state *state, char *name, char *fpr) gpg_error_t -result_add_timestamp (struct result_xml_state *state, char *name, +result_add_timestamp (struct result_xml_state *state, const char *name, unsigned int timestamp) { char code[20]; @@ -988,10 +576,10 @@ result_add_timestamp (struct result_xml_state *state, char *name, gpg_error_t -result_add_sig_mode (struct result_xml_state *state, char *name, +result_add_sig_mode (struct result_xml_state *state, const char *name, gpgme_sig_mode_t sig_mode) { - char *mode; + const char *mode; char code[20]; snprintf (code, sizeof (code) - 1, "%i", sig_mode); @@ -1018,7 +606,7 @@ result_add_sig_mode (struct result_xml_state *state, char *name, gpg_error_t -result_add_protocol (struct result_xml_state *state, char *name, +result_add_protocol (struct result_xml_state *state, const char *name, gpgme_protocol_t protocol) { const char *str; @@ -1036,7 +624,7 @@ result_add_protocol (struct result_xml_state *state, char *name, gpg_error_t -result_add_validity (struct result_xml_state *state, char *name, +result_add_validity (struct result_xml_state *state, const char *name, gpgme_validity_t validity) { const char *str; @@ -1073,7 +661,7 @@ result_add_validity (struct result_xml_state *state, char *name, gpg_error_t result_add_value (struct result_xml_state *state, - char *name, unsigned int val) + const char *name, unsigned int val) { char code[20]; @@ -1086,7 +674,7 @@ result_add_value (struct result_xml_state *state, gpg_error_t result_add_string (struct result_xml_state *state, - char *name, char *str) + const char *name, const char *str) { if (!str) str = ""; @@ -2100,6 +1688,8 @@ gt_identify (gpgme_tool_t gt, gpgme_data_t data) case GPGME_DATA_TYPE_INVALID: return gpg_error (GPG_ERR_GENERAL); case GPGME_DATA_TYPE_UNKNOWN : s = "unknown"; break; case GPGME_DATA_TYPE_PGP_SIGNED : s = "PGP-signed"; break; + case GPGME_DATA_TYPE_PGP_SIGNATURE: s = "PGP-signature"; break; + case GPGME_DATA_TYPE_PGP_ENCRYPTED: s = "PGP-encrypted"; break; case GPGME_DATA_TYPE_PGP_OTHER : s = "PGP"; break; case GPGME_DATA_TYPE_PGP_KEY : s = "PGP-key"; break; case GPGME_DATA_TYPE_CMS_SIGNED : s = "CMS-signed"; break; @@ -2140,9 +1730,9 @@ gt_result (gpgme_tool_t gt, unsigned int flags) { int indent = 2; - gt_write_data (gt, xml_preamble1, sizeof (xml_preamble1)); + gt_write_data (gt, xml_preamble1, strlen (xml_preamble1)); gt_write_data (gt, NULL, 0); - gt_write_data (gt, xml_preamble2, sizeof (xml_preamble2)); + gt_write_data (gt, xml_preamble2, strlen (xml_preamble2)); gt_write_data (gt, NULL, 0); if (flags & GT_RESULT_ENCRYPT) result_encrypt_to_xml (gt->ctx, indent, @@ -2168,7 +1758,7 @@ gt_result (gpgme_tool_t gt, unsigned int flags) if (flags & GT_RESULT_VFS_MOUNT) result_vfs_mount_to_xml (gt->ctx, indent, (result_xml_write_cb_t) gt_write_data, gt); - gt_write_data (gt, xml_end, sizeof (xml_end)); + gt_write_data (gt, xml_end, strlen (xml_end)); return 0; } @@ -2223,6 +1813,8 @@ server_passphrase_cb (void *opaque, const char *uid_hint, const char *info, unsigned char *buf = NULL; size_t buflen = 0; + (void)was_bad; + if (server && server->assuan_ctx) { if (uid_hint) @@ -2291,6 +1883,8 @@ server_data_encoding (const char *line) return GPGME_DATA_ENCODING_URLESC; if (strstr (line, "--url0")) return GPGME_DATA_ENCODING_URL0; + if (strstr (line, "--mime")) + return GPGME_DATA_ENCODING_MIME; return GPGME_DATA_ENCODING_NONE; } @@ -2395,6 +1989,9 @@ static gpg_error_t reset_notify (assuan_context_t ctx, char *line) { struct server *server = assuan_get_pointer (ctx); + + (void)line; + server_reset_fds (server); gt_reset (server->gt); return 0; @@ -2718,6 +2315,8 @@ cmd_signers_clear (assuan_context_t ctx, char *line) { struct server *server = assuan_get_pointer (ctx); + (void)line; + return gt_signers_clear (server->gt); } @@ -2734,6 +2333,8 @@ _cmd_decrypt_verify (assuan_context_t ctx, char *line, int verify) gpgme_data_t inp_data; gpgme_data_t out_data; + (void)line; + inp_fd = server->input_fd; inp_fn = server->input_filename; if (inp_fd == ASSUAN_INVALID_FD && !inp_fn) @@ -2960,6 +2561,8 @@ cmd_verify (assuan_context_t ctx, char *line) gpgme_data_t msg_data = NULL; gpgme_data_t out_data = NULL; + (void)line; + inp_fd = server->input_fd; inp_fn = server->input_filename; if (inp_fd == ASSUAN_INVALID_FD && !inp_fn) @@ -3135,6 +2738,8 @@ cmd_genkey (assuan_context_t ctx, char *line) gpgme_data_t parms_data = NULL; const char *parms; + (void)line; + inp_fd = server->input_fd; inp_fn = server->input_filename; if (inp_fd == ASSUAN_INVALID_FD && !inp_fn) @@ -3266,9 +2871,9 @@ cmd_keylist (assuan_context_t ctx, char *line) } pattern[idx] = NULL; - gt_write_data (gt, xml_preamble1, sizeof (xml_preamble1)); + gt_write_data (gt, xml_preamble1, strlen (xml_preamble1)); gt_write_data (gt, NULL, 0); - gt_write_data (gt, xml_preamble2, sizeof (xml_preamble2)); + gt_write_data (gt, xml_preamble2, strlen (xml_preamble2)); gt_write_data (gt, NULL, 0); result_init (&state, indent, (result_xml_write_cb_t) gt_write_data, gt); result_xml_tag_start (&state, "keylist", NULL); @@ -3343,7 +2948,7 @@ cmd_keylist (assuan_context_t ctx, char *line) } result_xml_tag_end (&state); /* keylist */ - gt_write_data (gt, xml_end, sizeof (xml_end)); + gt_write_data (gt, xml_end, strlen (xml_end)); server_reset_fds (server); @@ -3450,6 +3055,9 @@ static gpg_error_t cmd_result (assuan_context_t ctx, char *line) { struct server *server = assuan_get_pointer (ctx); + + (void)line; + return gt_result (server->gt, GT_RESULT_ALL); } @@ -3505,6 +3113,8 @@ cmd_identify (assuan_context_t ctx, char *line) char *inp_fn; gpgme_data_t inp_data; + (void)line; + inp_fd = server->input_fd; inp_fn = server->input_filename; if (inp_fd == ASSUAN_INVALID_FD && !inp_fn) @@ -3722,85 +3332,51 @@ gpgme_server (gpgme_tool_t gt) -/* MAIN PROGRAM STARTS HERE. */ - -const char *argp_program_version = VERSION; -const char *argp_program_bug_address = "bug-gpgme@gnupg.org"; -error_t argp_err_exit_status = 1; - -static char doc[] = "GPGME Tool -- Assuan server exposing GPGME operations"; -static char args_doc[] = "COMMAND [OPTIONS...]"; - -static struct argp_option options[] = { - { "server", 's', 0, 0, "Server mode" }, - { "gpg-binary", 501, "FILE", 0, "Use FILE for the GPG backend" }, - { "lib-version", 502, 0, 0, "Show library version" }, - { 0 } -}; - -static error_t parse_options (int key, char *arg, struct argp_state *state); -static struct argp argp = { options, parse_options, args_doc, doc }; - -struct args -{ - enum { CMD_DEFAULT, CMD_SERVER, CMD_LIBVERSION } cmd; - const char *gpg_binary; -}; - -void -args_init (struct args *args) -{ - memset (args, '\0', sizeof (*args)); - args->cmd = CMD_DEFAULT; -} - - -static error_t -parse_options (int key, char *arg, struct argp_state *state) +static const char * +my_strusage( int level ) { - struct args *args = state->input; + const char *p; - switch (key) + switch (level) { - case 's': - args->cmd = CMD_SERVER; - break; - - case 501: - args->gpg_binary = arg; + case 11: p = "gpgme-tool"; break; + case 13: p = PACKAGE_VERSION; break; + case 14: p = "Copyright (C) 2015 g10 Code GmbH"; break; + case 19: p = "Please report bugs to <" PACKAGE_BUGREPORT ">.\n"; break; + case 1: + case 40: + p = "Usage: gpgme-tool [OPTIONS] [COMMANDS]"; break; - - case 502: - args->cmd = CMD_LIBVERSION; - break; - -#if 0 - case ARGP_KEY_ARG: - if (state->arg_num >= 2) - argp_usage (state); - printf ("Arg[%i] = %s\n", state->arg_num, arg); + case 41: + p = "GPGME Tool -- Assuan server exposing GPGME operations\n"; break; - case ARGP_KEY_END: - if (state->arg_num < 2) - argp_usage (state); + case 42: + p = "1"; /* Flag print 40 as part of 41. */ break; -#endif - - default: - return ARGP_ERR_UNKNOWN; + default: p = NULL; break; } - return 0; + return p; } - + int main (int argc, char *argv[]) { - struct args args; + static ARGPARSE_OPTS opts[] = { + ARGPARSE_c ('s', "server", "Server mode"), + ARGPARSE_s_s(501, "gpg-binary", "|FILE|Use FILE for the GPG backend"), + ARGPARSE_c (502, "lib-version", "Show library version"), + ARGPARSE_end() + }; + ARGPARSE_ARGS pargs = { &argc, &argv, 0 }; + enum { CMD_DEFAULT, CMD_SERVER, CMD_LIBVERSION } cmd = CMD_DEFAULT; + const char *gpg_binary = NULL; struct gpgme_tool gt; gpg_error_t err; int needgt = 1; + set_strusage (my_strusage); + #ifdef HAVE_SETLOCALE setlocale (LC_ALL, ""); #endif @@ -3812,30 +3388,40 @@ main (int argc, char *argv[]) gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); #endif - args_init (&args); - - argp_parse (&argp, argc, argv, 0, 0, &args); log_init (); - if (args.cmd == CMD_LIBVERSION) + while (arg_parse (&pargs, opts)) + { + switch (pargs.r_opt) + { + case 's': cmd = CMD_SERVER; break; + case 501: gpg_binary = pargs.r.ret_str; break; + case 502: cmd = CMD_LIBVERSION; break; + default: + pargs.err = ARGPARSE_PRINT_WARNING; + break; + } + } + + if (cmd == CMD_LIBVERSION) needgt = 0; - if (needgt && args.gpg_binary) + if (needgt && gpg_binary) { - if (access (args.gpg_binary, X_OK)) + if (access (gpg_binary, X_OK)) err = gpg_error_from_syserror (); else err = gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, - args.gpg_binary, NULL); + gpg_binary, NULL); if (err) log_error (1, err, "error witching OpenPGP engine to '%s'", - args.gpg_binary); + gpg_binary); } if (needgt) gt_init (>); - switch (args.cmd) + switch (cmd) { case CMD_DEFAULT: case CMD_SERVER: @@ -3860,4 +3446,3 @@ main (int argc, char *argv[]) return 0; } - |