diff options
Diffstat (limited to 'g10/gpgv.c')
| -rw-r--r-- | g10/gpgv.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index f0308661a..ac4b1feb7 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -1,6 +1,7 @@ /* gpgv.c - The GnuPG signature verify utility - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006, - * 2008, 2009, 2012 Free Software Foundation, Inc. + * Copyright (C) 1998-2020 Free Software Foundation, Inc. + * Copyright (C) 1998-2019 Werner Koch + * Copyright (C) 2015-2020 g10 Code GmbH * * This file is part of GnuPG. * @@ -16,6 +17,7 @@ * * 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> @@ -138,9 +140,11 @@ my_strusage( int level ) switch (level) { + case 9: p = "GPL-3.0-or-later"; break; case 11: p = "@GPG@v (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; @@ -172,7 +176,6 @@ main( int argc, char **argv ) int rc=0; strlist_t sl; strlist_t nrings = NULL; - unsigned configlineno; ctrl_t ctrl; early_system_init (); @@ -206,11 +209,13 @@ main( int argc, char **argv ) pargs.argc = &argc; pargs.argv = &argv; - pargs.flags= 1; /* do not remove the args */ - while (optfile_parse( NULL, NULL, &configlineno, &pargs, opts)) + pargs.flags= ARGPARSE_FLAG_KEEP; + while (gnupg_argparser (&pargs, opts, NULL)) { switch (pargs.r_opt) { + case ARGPARSE_CONFFILE: break; + case oQuiet: opt.quiet = 1; break; case oVerbose: opt.verbose++; @@ -250,6 +255,8 @@ main( int argc, char **argv ) } } + gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */ + if (log_get_errorcount (0)) g10_exit(2); |