diff options
Diffstat (limited to 'agent/preset-passphrase.c')
| -rw-r--r-- | agent/preset-passphrase.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index 496cee73d..df6da00e3 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see <https://www.gnu.org/licenses/>. + * SPDX-License-Identifier: GPL-3.0-or-later */ #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> @@ -52,7 +50,6 @@ #include "../common/i18n.h" #include "../common/sysutils.h" #include "../common/init.h" -#include "../common/argparse.h" /* temporary hack. */ enum cmd_and_opt_values @@ -72,7 +69,7 @@ aTest }; static const char *opt_passphrase; -static ARGPARSE_OPTS opts[] = { +static gpgrt_opt_t opts[] = { { 301, NULL, 0, N_("@Options:\n ") }, @@ -93,9 +90,11 @@ my_strusage (int level) const char *p; switch (level) { + case 9: p = "GPL-3.0-or-later"; break; case 11: p = "gpg-preset-passphrase (@GNUPG@)"; break; case 13: p = VERSION; break; + case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break; case 17: p = PRINTABLE_OS_NAME; break; case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break; @@ -207,12 +206,12 @@ forget_passphrase (const char *keygrip) int main (int argc, char **argv) { - ARGPARSE_ARGS pargs; + gpgrt_argparse_t pargs; int cmd = 0; const char *keygrip = NULL; early_system_init (); - set_strusage (my_strusage); + gpgrt_set_strusage (my_strusage); log_set_prefix ("gpg-preset-passphrase", GPGRT_LOG_WITH_PREFIX); /* Make sure that our subsystems are ready. */ @@ -221,8 +220,8 @@ main (int argc, char **argv) pargs.argc = &argc; pargs.argv = &argv; - pargs.flags= 1; /* (do not remove the args) */ - while (arg_parse (&pargs, opts) ) + pargs.flags= ARGPARSE_FLAG_KEEP; + while (gpgrt_argparse (NULL, &pargs, opts)) { switch (pargs.r_opt) { @@ -236,13 +235,15 @@ main (int argc, char **argv) default : pargs.err = 2; break; } } + gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */ + if (log_get_errorcount(0)) exit(2); if (argc == 1) keygrip = *argv; else - usage (1); + gpgrt_usage (1); /* Tell simple-pwquery about the standard socket name. */ { |