lttng: show man page when using command's --help

[lttng-tools.git] / src / bin / lttng / commands / view.c

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index e1e1564c16ebe9f0e3650a27ac80eac1d7c34638..dac2c3e247b4e3607bafeb6de7db7c5a3799e6da 100644 (file)
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
@@ -26,7 +25,6 @@
 #include <unistd.h>
 
 #include "../command.h"
-#include <config.h>
 
 static char *opt_session_name;
 static char *opt_viewer;
@@ -111,12 +109,6 @@ static struct viewers *parse_options(void)
                return &(viewers[VIEWER_BABELTRACE]);
        }
 
-#if 0
-       if (strstr(opt_viewer, viewers[VIEWER_LTTV_GUI].exec_name) == 0) {
-               return &(viewers[VIEWER_LTTV_GUI]);
-       }
-#endif
-
        /*
         * This means that if -e, --viewers is used, we just override everything
         * with it. For supported viewers like lttv, we could simply detect if "-t"
@@ -258,17 +250,6 @@ static int spawn_viewer(const char *trace_path)
                argv = alloc_argv_from_local_opts(babeltrace_opts,
                                ARRAY_SIZE(babeltrace_opts), trace_path);
                break;
-#if 0
-       case VIEWER_LTTV_GUI:
-               if (stat(lttv_gui_bin, &status) == 0) {
-                       viewer_bin = lttv_gui_bin;
-               } else {
-                       viewer_bin = viewer->exec_name;
-               }
-               argv = alloc_argv_from_local_opts(lttv_gui_opts,
-                               ARRAY_SIZE(lttv_gui_opts), trace_path);
-               break;
-#endif
        case VIEWER_USER_DEFINED:
                argv = alloc_argv_from_user_opts(opt_viewer, trace_path);
                if (argv) {
@@ -282,7 +263,7 @@ static int spawn_viewer(const char *trace_path)
                break;
        }
 
-       if (argv == NULL) {
+       if (argv == NULL || !viewer_bin) {
                ret = CMD_FATAL;
                goto error;
        }
@@ -463,7 +444,7 @@ int cmd_view(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stdout);
+                       SHOW_HELP();
                        goto end;
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);