security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-29 21:58:04 +02:00
Code Activity

agent: Print the non-option warning earlier.

Browse Source 
* agent/gpg-agent.c (main): Move detection up.
--

The problem is that PARGS is re-used and when detecting a possible
incorrect use, the flag that "--" has already been seen has gone.
This commit is contained in:
Werner Koch 2021-11-14 18:06:33 +01:00
parent a9bc8e1695
commit bd5c775878
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
agent/gpg-agent.c
View File

@ -1321,6 +1321,16 @@ main (int argc, char **argv)
} }
} }
/* Print a warning if an argument looks like an option. */
if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
{
int i;
for (i=0; i < argc; i++)
if (argv[i][0] == '-' && argv[i][1] == '-')
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
}
gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */ gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */
if (!last_configname) if (!last_configname)
@ -1345,16 +1355,6 @@ main (int argc, char **argv)
comopt.logfile = NULL; comopt.logfile = NULL;
} }
/* Print a warning if an argument looks like an option. */
if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
{
int i;
for (i=0; i < argc; i++)
if (argv[i][0] == '-' && argv[i][1] == '-')
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
}
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
/* gpg-agent usually does not output any messages because it runs in /* gpg-agent usually does not output any messages because it runs in
the background. For log files it is acceptable to have messages the background. For log files it is acceptable to have messages