diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-04-03 14:05:09 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-04-14 16:51:11 +0200 |
| commit | f56c9c7c942cd82595bb47808c732048141dc72d (patch) | |
| tree | b35fb61f2d0ce7af0482b9baf6632e91877f0cf9 /apps | |
| parent | 3ad6030948ac999de165f6185116459d74644e8d (diff) | |
| download | openssl-f56c9c7c942cd82595bb47808c732048141dc72d.tar.gz | |
APPS and TEST: Make sure prog name is set for usage output
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14841)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/cmp.c | 2 | ||||
| -rw-r--r-- | apps/lib/opt.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index 135c509831..53996a7cc8 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2536,8 +2536,8 @@ int cmp_main(int argc, char **argv) char mock_server[] = "mock server:1"; int ret = 0; /* default: failure */ + prog = opt_appname(argv[0]); if (argc <= 1) { - prog = opt_appname(argv[0]); opt_help(cmp_options); goto err; } diff --git a/apps/lib/opt.c b/apps/lib/opt.c index 8cc520daec..4077cf2936 100644 --- a/apps/lib/opt.c +++ b/apps/lib/opt.c @@ -162,6 +162,9 @@ char *opt_init(int ac, char **av, const OPTIONS *o) opts = o; unknown = NULL; + /* Make sure prog name is set for usage output */ + (void)opt_progname(argv[0]); + /* Check all options up until the PARAM marker (if present) */ for (; o->name != NULL && o->name != OPT_PARAM_STR; ++o) { #ifndef NDEBUG |