mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Backport of the new option parser from 2.3
* configure.ac (GPGRT_ENABLE_ARGPARSE_MACROS): Define. * common/argparse.c, common/argparse.h: Rewrite. * tests/gpgscm/main.c: Switch to the new option parser. * g10/gpg.c: Switch to the new option parser and enable a global conf file. * g10/gpgv.c: Ditto. * agent/gpg-agent.c: Ditto. * agent/preset-passphrase.c: Ditto. * agent/protect-tool.c: Ditto. * scd/scdaemon.c: Ditto. * dirmngr/dirmngr.c: Ditto. * dirmngr/dirmngr_ldap.c: Ditto * dirmngr/dirmngr-client.c: Ditto. * kbx/kbxutil.c: Ditto. * tools/gpg-card.c: Ditto. * tools/gpg-check-pattern.c: Ditto. * tools/gpg-connect-agent.c: Ditto. * tools/gpg-pair-tool.c: Ditto. * tools/gpg-wks-client.c: Ditto. * tools/gpg-wks-server.c: Ditto. * tools/gpgconf.c: Ditto. * tools/gpgsplit.c: Ditto. * tools/gpgtar.c: Ditto. * g13/g13.c: Ditto. * g13/g13-syshelp.c: Ditto. Do not force verbose mode. * sm/gpgsm.c: Ditto. Add option --no-options. -- This is backport from master commitcdbe10b762commitba463128cecommit3bc004decdcommit2c823bd878commit0e8f6e2aa9but without changing all functions names to gpgrt. Instead we use wrapper functions which, when building against old Libgpg-error versions, are implemented in argparse.c using code from the current libgpg-error. This allows to keep the dependency requirement at libgpg-error 1.27 to support older distributions. Tested builds against 1.27 and 1.40-beta. Note that g13-syshelp does not anymore default to --verbose because that can now be enabled in /etc/gnupg/g13-syshelp.conf. GnuPG-bug-id: 4788 Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch
parent
7d7a50ba72
commit
a028f24136
25 changed files with 2590 additions and 1463 deletions
|
|
@ -1,6 +1,7 @@
|
|||
/* gpg-agent.c - The GnuPG Agent
|
||||
* Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2000-2016 Werner Koch
|
||||
* Copyright (C) 2000-2020 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2000-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>
|
||||
|
|
@ -169,7 +171,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
||||
ARGPARSE_s_n (oSh, "sh", N_("sh-style command output")),
|
||||
ARGPARSE_s_n (oCsh, "csh", N_("csh-style command output")),
|
||||
ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
|
||||
ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
|
||||
|
||||
ARGPARSE_s_s (oDebug, "debug", "@"),
|
||||
ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
|
||||
|
|
@ -264,6 +266,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
ARGPARSE_op_u (oAutoExpandSecmem, "auto-expand-secmem", "@"),
|
||||
|
||||
ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
|
||||
ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
|
||||
|
||||
/* Dummy options for backward compatibility. */
|
||||
ARGPARSE_o_s (oWriteEnvFile, "write-env-file", "@"),
|
||||
|
|
@ -397,7 +400,9 @@ static char *default_lc_ctype;
|
|||
static char *default_lc_messages;
|
||||
static char *default_xauthority;
|
||||
|
||||
/* Name of a config file, which will be reread on a HUP if it is not NULL. */
|
||||
/* Name of a config file which was last read on startup or, if missing,
|
||||
* the name of the standard config file. Any value here enables the
|
||||
* rereading of the standard config files on SIGHUP. */
|
||||
static char *config_filename;
|
||||
|
||||
/* Helper to implement --debug-level */
|
||||
|
|
@ -514,9 +519,11 @@ my_strusage (int level)
|
|||
|
||||
switch (level)
|
||||
{
|
||||
case 9: p = "GPL-3.0-or-later"; break;
|
||||
case 11: p = "@GPG_AGENT@ (@GNUPG@)";
|
||||
break;
|
||||
case 13: p = VERSION; break;
|
||||
case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
|
||||
case 17: p = PRINTABLE_OS_NAME; break;
|
||||
/* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
|
||||
reporting address. This is so that we can change the
|
||||
|
|
@ -1007,12 +1014,10 @@ main (int argc, char **argv )
|
|||
ARGPARSE_ARGS pargs;
|
||||
int orig_argc;
|
||||
char **orig_argv;
|
||||
FILE *configfp = NULL;
|
||||
char *configname = NULL;
|
||||
char *last_configname = NULL;
|
||||
const char *configname = NULL;
|
||||
int debug_argparser = 0;
|
||||
const char *shell;
|
||||
unsigned configlineno;
|
||||
int parse_debug = 0;
|
||||
int default_config =1;
|
||||
int pipe_server = 0;
|
||||
int is_daemon = 0;
|
||||
int nodetach = 0;
|
||||
|
|
@ -1111,80 +1116,67 @@ main (int argc, char **argv )
|
|||
orig_argv = argv;
|
||||
pargs.argc = &argc;
|
||||
pargs.argv = &argv;
|
||||
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
|
||||
while (arg_parse( &pargs, opts))
|
||||
pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
|
||||
while (gnupg_argparse (NULL, &pargs, opts))
|
||||
{
|
||||
if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
|
||||
parse_debug++;
|
||||
else if (pargs.r_opt == oOptions)
|
||||
{ /* yes there is one, so we do not try the default one, but
|
||||
read the option file when it is encountered at the
|
||||
commandline */
|
||||
default_config = 0;
|
||||
}
|
||||
else if (pargs.r_opt == oNoOptions)
|
||||
default_config = 0; /* --no-options */
|
||||
else if (pargs.r_opt == oHomedir)
|
||||
gnupg_set_homedir (pargs.r.ret_str);
|
||||
else if (pargs.r_opt == oDebugQuickRandom)
|
||||
{
|
||||
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
||||
}
|
||||
switch (pargs.r_opt)
|
||||
{
|
||||
case oDebug:
|
||||
case oDebugAll:
|
||||
debug_argparser++;
|
||||
break;
|
||||
|
||||
case oHomedir:
|
||||
gnupg_set_homedir (pargs.r.ret_str);
|
||||
break;
|
||||
|
||||
case oDebugQuickRandom:
|
||||
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Reset the flags. */
|
||||
pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
|
||||
|
||||
/* Initialize the secure memory. */
|
||||
gcry_control (GCRYCTL_INIT_SECMEM, SECMEM_BUFFER_SIZE, 0);
|
||||
maybe_setuid = 0;
|
||||
|
||||
/*
|
||||
Now we are now working under our real uid
|
||||
*/
|
||||
* Now we are now working under our real uid
|
||||
*/
|
||||
|
||||
if (default_config)
|
||||
configname = make_filename (gnupg_homedir (),
|
||||
GPG_AGENT_NAME EXTSEP_S "conf", NULL);
|
||||
gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
|
||||
gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
|
||||
|
||||
argc = orig_argc;
|
||||
argv = orig_argv;
|
||||
pargs.argc = &argc;
|
||||
pargs.argv = &argv;
|
||||
pargs.flags= 1; /* do not remove the args */
|
||||
next_pass:
|
||||
if (configname)
|
||||
{
|
||||
configlineno = 0;
|
||||
configfp = gnupg_fopen (configname, "r");
|
||||
if (!configfp)
|
||||
{
|
||||
if (default_config)
|
||||
{
|
||||
if( parse_debug )
|
||||
log_info (_("Note: no default option file '%s'\n"),
|
||||
configname );
|
||||
/* Save the default conf file name so that
|
||||
reread_configuration is able to test whether the
|
||||
config file has been created in the meantime. */
|
||||
xfree (config_filename);
|
||||
config_filename = configname;
|
||||
configname = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
log_error (_("option file '%s': %s\n"),
|
||||
configname, strerror(errno) );
|
||||
exit(2);
|
||||
}
|
||||
xfree (configname);
|
||||
configname = NULL;
|
||||
}
|
||||
if (parse_debug && configname )
|
||||
log_info (_("reading options from '%s'\n"), configname );
|
||||
default_config = 0;
|
||||
}
|
||||
/* We are re-using the struct, thus the reset flag. We OR the
|
||||
* flags so that the internal intialized flag won't be cleared. */
|
||||
pargs.flags |= (ARGPARSE_FLAG_RESET
|
||||
| ARGPARSE_FLAG_KEEP
|
||||
| ARGPARSE_FLAG_SYS
|
||||
| ARGPARSE_FLAG_USER);
|
||||
|
||||
while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
|
||||
while (gnupg_argparser (&pargs, opts, GPG_AGENT_NAME EXTSEP_S "conf"))
|
||||
{
|
||||
if (pargs.r_opt == ARGPARSE_CONFFILE)
|
||||
{
|
||||
if (debug_argparser)
|
||||
log_info (_("reading options from '%s'\n"),
|
||||
pargs.r_type? pargs.r.ret_str: "[cmdline]");
|
||||
if (pargs.r_type)
|
||||
{
|
||||
xfree (last_configname);
|
||||
last_configname = xstrdup (pargs.r.ret_str);
|
||||
configname = last_configname;
|
||||
}
|
||||
else
|
||||
configname = NULL;
|
||||
continue;
|
||||
}
|
||||
if (parse_rereadable_options (&pargs, 0))
|
||||
continue; /* Already handled */
|
||||
switch (pargs.r_opt)
|
||||
|
|
@ -1196,18 +1188,8 @@ main (int argc, char **argv )
|
|||
|
||||
case oDebugWait: debug_wait = pargs.r.ret_int; break;
|
||||
|
||||
case oOptions:
|
||||
/* config files may not be nested (silently ignore them) */
|
||||
if (!configfp)
|
||||
{
|
||||
xfree(configname);
|
||||
configname = xstrdup(pargs.r.ret_str);
|
||||
goto next_pass;
|
||||
}
|
||||
break;
|
||||
case oNoGreeting: /* Dummy option. */ break;
|
||||
case oNoVerbose: opt.verbose = 0; break;
|
||||
case oNoOptions: break; /* no-options */
|
||||
case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
|
||||
case oNoDetach: nodetach = 1; break;
|
||||
case oLogFile: logfile = pargs.r.ret_str; break;
|
||||
|
|
@ -1228,7 +1210,7 @@ main (int argc, char **argv )
|
|||
|
||||
case oUseStandardSocket:
|
||||
case oNoUseStandardSocket:
|
||||
obsolete_option (configname, configlineno, "use-standard-socket");
|
||||
obsolete_option (configname, pargs.lineno, "use-standard-socket");
|
||||
break;
|
||||
|
||||
case oFakedSystemTime:
|
||||
|
|
@ -1280,28 +1262,29 @@ main (int argc, char **argv )
|
|||
break;
|
||||
|
||||
case oWriteEnvFile:
|
||||
obsolete_option (configname, configlineno, "write-env-file");
|
||||
obsolete_option (configname, pargs.lineno, "write-env-file");
|
||||
break;
|
||||
|
||||
default : pargs.err = configfp? 1:2; break;
|
||||
default:
|
||||
if (configname)
|
||||
pargs.err = ARGPARSE_PRINT_WARNING;
|
||||
else
|
||||
pargs.err = ARGPARSE_PRINT_ERROR;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (configfp)
|
||||
gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
|
||||
|
||||
if (!last_configname)
|
||||
config_filename = make_filename (gnupg_homedir (),
|
||||
GPG_AGENT_NAME EXTSEP_S "conf",
|
||||
NULL);
|
||||
else
|
||||
{
|
||||
fclose( configfp );
|
||||
configfp = NULL;
|
||||
/* Keep a copy of the name so that it can be read on SIGHUP. */
|
||||
if (config_filename != configname)
|
||||
{
|
||||
xfree (config_filename);
|
||||
config_filename = configname;
|
||||
}
|
||||
configname = NULL;
|
||||
goto next_pass;
|
||||
config_filename = last_configname;
|
||||
last_configname = NULL;
|
||||
}
|
||||
|
||||
xfree (configname);
|
||||
configname = NULL;
|
||||
if (log_get_errorcount(0))
|
||||
exit(2);
|
||||
|
||||
|
|
@ -1398,18 +1381,13 @@ main (int argc, char **argv )
|
|||
agent_exit (0);
|
||||
else if (gpgconf_list)
|
||||
{
|
||||
char *filename;
|
||||
char *filename_esc;
|
||||
|
||||
/* List options and default values in the GPG Conf format. */
|
||||
filename = make_filename (gnupg_homedir (),
|
||||
GPG_AGENT_NAME EXTSEP_S "conf", NULL);
|
||||
filename_esc = percent_escape (filename, NULL);
|
||||
|
||||
filename_esc = percent_escape (config_filename, NULL);
|
||||
es_printf ("%s-%s.conf:%lu:\"%s\n",
|
||||
GPGCONF_NAME, GPG_AGENT_NAME,
|
||||
GC_OPT_FLAG_DEFAULT, filename_esc);
|
||||
xfree (filename);
|
||||
xfree (filename_esc);
|
||||
|
||||
es_printf ("verbose:%lu:\n"
|
||||
|
|
@ -2019,35 +1997,39 @@ static void
|
|||
reread_configuration (void)
|
||||
{
|
||||
ARGPARSE_ARGS pargs;
|
||||
FILE *fp;
|
||||
unsigned int configlineno = 0;
|
||||
char *twopart;
|
||||
int dummy;
|
||||
|
||||
if (!config_filename)
|
||||
return; /* No config file. */
|
||||
|
||||
fp = gnupg_fopen (config_filename, "r");
|
||||
if (!fp)
|
||||
{
|
||||
log_info (_("option file '%s': %s\n"),
|
||||
config_filename, strerror(errno) );
|
||||
return;
|
||||
}
|
||||
twopart = strconcat (GPG_AGENT_NAME EXTSEP_S "conf" PATHSEP_S,
|
||||
config_filename, NULL);
|
||||
if (!twopart)
|
||||
return; /* Out of core. */
|
||||
|
||||
parse_rereadable_options (NULL, 1); /* Start from the default values. */
|
||||
|
||||
memset (&pargs, 0, sizeof pargs);
|
||||
dummy = 0;
|
||||
pargs.argc = &dummy;
|
||||
pargs.flags = 1; /* do not remove the args */
|
||||
while (optfile_parse (fp, config_filename, &configlineno, &pargs, opts) )
|
||||
pargs.flags = (ARGPARSE_FLAG_KEEP
|
||||
|ARGPARSE_FLAG_SYS
|
||||
|ARGPARSE_FLAG_USER);
|
||||
while (gnupg_argparser (&pargs, opts, twopart))
|
||||
{
|
||||
if (pargs.r_opt < -1)
|
||||
pargs.err = 1; /* Print a warning. */
|
||||
if (pargs.r_opt == ARGPARSE_CONFFILE)
|
||||
{
|
||||
log_info (_("reading options from '%s'\n"),
|
||||
pargs.r_type? pargs.r.ret_str: "[cmdline]");
|
||||
}
|
||||
else if (pargs.r_opt < -1)
|
||||
pargs.err = ARGPARSE_PRINT_WARNING;
|
||||
else /* Try to parse this option - ignore unchangeable ones. */
|
||||
parse_rereadable_options (&pargs, 1);
|
||||
}
|
||||
fclose (fp);
|
||||
gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
|
||||
xfree (twopart);
|
||||
finalize_rereadable_options ();
|
||||
set_debug ();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue