mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

APPS: Allow duplicate entries in options list, marking them OPT_DUP

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15126)
This commit is contained in:
Dr. David von Oheimb 2021-04-12 19:00:00 +02:00 committed by Dr. David von Oheimb
parent 601fe8e0d7
commit 56c4f6fe72
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/include/opt.h
View File

@ -318,6 +318,7 @@ typedef struct options_st {
} OPTIONS;
/* Special retval values: */
#define OPT_PARAM 0 /* same as OPT_EOF usually defined in apps */
#define OPT_DUP -2 /* marks duplicate occurrence of option in help output */
/*
* A string/int pairing; widely use for option value lookup, hence the

11
apps/lib/opt.c
View File

@ -187,7 +187,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
if (o->valtype == '.')
OPENSSL_assert(o->retval == OPT_PARAM);
else
OPENSSL_assert(o->retval > OPT_PARAM);
OPENSSL_assert(o->retval == OPT_DUP || o->retval > OPT_PARAM);
switch (i) {
case 0: case '-': case '.':
case '/': case '<': case '>': case 'E': case 'F':
@ -203,8 +203,13 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
/*
* Some compilers inline strcmp and the assert string is too long.
*/
duplicated = strcmp(o->name, next->name) == 0;
OPENSSL_assert(!duplicated);
duplicated = next->retval != OPT_DUP
&& strcmp(o->name, next->name) == 0;
if (duplicated) {
opt_printf_stderr("%s: Internal error: duplicate option %s\n",
prog, o->name);
OPENSSL_assert(!duplicated);
}
}
#endif
if (o->name[0] == '\0') {