diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-12 12:39:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-12 12:39:59 +0300 |
| commit | aaecd681f60fa02c7697198b308336a13b231f30 (patch) | |
| tree | a6c6535d9553d63c4150dfe40669376e988f980f /tools/lib/subcmd/parse-options.c | |
| parent | b84a9523bab4a2483d7b7566b81a7859c2fd9a78 (diff) | |
| parent | 103a4e4a4351d3d5214c4f54fdf89f0f81b692ef (diff) | |
| download | linux-aaecd681f60fa02c7697198b308336a13b231f30.tar.xz | |
Merge v6.9.4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/lib/subcmd/parse-options.c')
| -rw-r--r-- | tools/lib/subcmd/parse-options.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c index 9fa75943f2ed..d943d78b787e 100644 --- a/tools/lib/subcmd/parse-options.c +++ b/tools/lib/subcmd/parse-options.c @@ -633,11 +633,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o const char *const subcommands[], const char *usagestr[], int flags) { struct parse_opt_ctx_t ctx; + char *buf = NULL; /* build usage string if it's not provided */ if (subcommands && !usagestr[0]) { - char *buf = NULL; - astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_name, argv[0]); for (int i = 0; subcommands[i]; i++) { @@ -679,7 +678,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt); usage_with_options(usagestr, options); } - + if (buf) { + usagestr[0] = NULL; + free(buf); + } return parse_options_end(&ctx); } |