1 files changed, 35 insertions, 15 deletions

diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index 6d5a8a7faf48..25c8b942ff85 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -24,13 +24,14 @@ static struct man_viewer_info_list {
 } *man_viewer_info_list;
 
 enum help_format {
+        HELP_FORMAT_NONE,
         HELP_FORMAT_MAN,
         HELP_FORMAT_INFO,
         HELP_FORMAT_WEB,
 };
 
 static bool show_all = false;
-static enum help_format help_format = HELP_FORMAT_MAN;
+static enum help_format help_format = HELP_FORMAT_NONE;
 static 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),
@@ -54,7 +55,9 @@ static enum help_format parse_help_format(const char *format)
                 return HELP_FORMAT_INFO;
         if (!strcmp(format, "web") || !strcmp(format, "html"))
                 return HELP_FORMAT_WEB;
-        die("unrecognized help format '%s'", format);
+
+        pr_err("unrecognized help format '%s'", format);
+        return HELP_FORMAT_NONE;
 }
 
 static const char *get_man_viewer_info(const char *name)
@@ -259,6 +262,8 @@ static int perf_help_config(const char *var, const char *value, void *cb)
                 if (!value)
                         return config_error_nonbool(var);
                 help_format = parse_help_format(value);
+                if (help_format == HELP_FORMAT_NONE)
+                        return -1;
                 return 0;
         }
         if (!strcmp(var, "man.viewer")) {
@@ -352,7 +357,7 @@ static void exec_viewer(const char *name, const char *page)
                 warning("'%s': unknown man viewer.", name);
 }
 
-static void show_man_page(const char *perf_cmd)
+static int show_man_page(const char *perf_cmd)
 {
         struct man_viewer_list *viewer;
         const char *page = cmd_to_page(perf_cmd);
@@ -365,28 +370,35 @@ static void show_man_page(const char *perf_cmd)
         if (fallback)
                 exec_viewer(fallback, page);
         exec_viewer("man", page);
-        die("no man viewer handled the request");
+
+        pr_err("no man viewer handled the request");
+        return -1;
 }
 
-static void show_info_page(const char *perf_cmd)
+static int show_info_page(const char *perf_cmd)
 {
         const char *page = cmd_to_page(perf_cmd);
         setenv("INFOPATH", system_path(PERF_INFO_PATH), 1);
         execlp("info", "info", "perfman", page, NULL);
+        return -1;
 }
 
-static void get_html_page_path(struct strbuf *page_path, const char *page)
+static int get_html_page_path(struct strbuf *page_path, const char *page)
 {
         struct stat st;
         const char *html_path = system_path(PERF_HTML_PATH);
 
         /* Check that we have a perf documentation directory. */
         if (stat(mkpath("%s/perf.html", html_path), &st)
-            || !S_ISREG(st.st_mode))
-                die("'%s': not a documentation directory.", html_path);
+            || !S_ISREG(st.st_mode)) {
+                pr_err("'%s': not a documentation directory.", html_path);
+                return -1;
+        }
 
         strbuf_init(page_path, 0);
         strbuf_addf(page_path, "%s/%s.html", html_path, page);
+
+        return 0;
 }
 
 /*
@@ -401,19 +413,23 @@ static void open_html(const char *path)
 }
 #endif
 
-static void show_html_page(const char *perf_cmd)
+static int show_html_page(const char *perf_cmd)
 {
         const char *page = cmd_to_page(perf_cmd);
         struct strbuf page_path; /* it leaks but we exec bellow */
 
-        get_html_page_path(&page_path, page);
+        if (get_html_page_path(&page_path, page) != 0)
+                return -1;
 
         open_html(page_path.buf);
+
+        return 0;
 }
 
-int cmd_help(int argc, const char **argv, const char *prefix __used)
+int cmd_help(int argc, const char **argv, const char *prefix __maybe_unused)
 {
         const char *alias;
+        int rc = 0;
 
         load_command_list("perf-", &main_cmds, &other_cmds);
 
@@ -444,16 +460,20 @@ int cmd_help(int argc, const char **argv, const char *prefix __used)
 
         switch (help_format) {
         case HELP_FORMAT_MAN:
-                show_man_page(argv[0]);
+                rc = show_man_page(argv[0]);
                 break;
         case HELP_FORMAT_INFO:
-                show_info_page(argv[0]);
+                rc = show_info_page(argv[0]);
                 break;
         case HELP_FORMAT_WEB:
-                show_html_page(argv[0]);
+                rc = show_html_page(argv[0]);
+                break;
+        case HELP_FORMAT_NONE:
+                /* fall-through */
         default:
+                rc = -1;
                 break;
         }
 
-        return 0;
+        return rc;
 }