Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 670ab5d2 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf help: Fix --help for builtins 



It seems that commit cc584821 ("perf help: Remove use of die and
handle errors") caused the problem - it changed the initial value of
'help_format' from HELP_FORMAT_MAN to HELP_FORMAT_NONE.

This broke the --help option for all builtins, that would produce no
output, while 'man perf-top' would work it MANPATH is properly setup.

Reported-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/87r4orj7zc.fsf@sejong.aot.lge.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fc551f8d

tools/perf/builtin-help.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int show_html_page(const char *perf_cmd) 
int cmd_help(int argc, const char **argv, const char *prefix __maybe_unused)

{

	bool show_all = false;

	enum help_format help_format = HELP_FORMAT_NONE;

	enum help_format help_format = HELP_FORMAT_MAN;

	struct option builtin_help_options[] = {

	OPT_BOOLEAN('a', "all", &show_all, "print all available commands"),

	OPT_SET_UINT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),