Remove generic error reporting from the lttng client

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

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 9317e83dc5873d84a3c107d64ca5d6b9de228f1f..8842a03b51e0dd1a602b716c40eb2494d8b77836 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -32,6 +32,15 @@
 #include <common/utils.h>
 
 #include "command.h"
+#include "version.h"
+
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
 
 /* Variables */
 static char *progname;
@@ -66,7 +75,6 @@ static struct option long_options[] = {
 /* First level command */
 static struct cmd_struct commands[] =  {
        { "add-context", cmd_add_context},
-       { "calibrate", cmd_calibrate},
        { "create", cmd_create},
        { "destroy", cmd_destroy},
        { "disable-channel", cmd_disable_channels},
@@ -77,6 +85,10 @@ static struct cmd_struct commands[] =  {
        { "list", cmd_list},
        { "load", cmd_load},
        { "metadata", cmd_metadata},
+       { "regenerate", cmd_regenerate},
+       { "rotate", cmd_rotate},
+       { "enable-rotation", cmd_enable_rotation},
+       { "disable-rotation", cmd_disable_rotation},
        { "save", cmd_save},
        { "set-session", cmd_set_session},
        { "snapshot", cmd_snapshot},
@@ -85,10 +97,8 @@ static struct cmd_struct commands[] =  {
        { "stop", cmd_stop},
        { "track", cmd_track},
        { "untrack", cmd_untrack},
-       { "help", NULL},
        { "version", cmd_version},
        { "view", cmd_view},
-       { "regenerate", cmd_regenerate},
        { NULL, NULL}   /* Array closure */
 };
 
@@ -243,6 +253,23 @@ end:
        return ret;
 }
 
+static bool command_exists(const char *command)
+{
+       const struct cmd_struct *cmd = commands;
+       bool exists = false;
+
+       while (cmd->name != NULL) {
+               if (!strcmp(command, cmd->name)) {
+                       exists = true;
+                       goto end;
+               }
+               cmd++;
+       }
+
+end:
+       return exists;
+}
+
 static void show_basic_help(void)
 {
        puts("Usage: lttng [--group=GROUP] [--mi=TYPE] [--no-sessiond | --sessiond-path=PATH]");
@@ -254,7 +281,7 @@ static void show_basic_help(void)
        puts("  create            " CONFIG_CMD_DESCR_CREATE);
        puts("  destroy           " CONFIG_CMD_DESCR_DESTROY);
        puts("  load              " CONFIG_CMD_DESCR_LOAD);
-       puts("  metadata          " CONFIG_CMD_DESCR_METADATA);
+       puts("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
        puts("  save              " CONFIG_CMD_DESCR_SAVE);
        puts("  set-session       " CONFIG_CMD_DESCR_SET_SESSION);
        puts("");
@@ -281,7 +308,6 @@ static void show_basic_help(void)
        puts("  untrack           " CONFIG_CMD_DESCR_UNTRACK);
        puts("");
        puts("Miscellaneous:");
-       puts("  calibrate         " CONFIG_CMD_DESCR_CALIBRATE);
        puts("  help              " CONFIG_CMD_DESCR_HELP);
        puts("  version           " CONFIG_CMD_DESCR_VERSION);
        puts("  view              " CONFIG_CMD_DESCR_VIEW);
@@ -300,7 +326,6 @@ static void show_basic_help(void)
 static int parse_args(int argc, char **argv)
 {
        int opt, ret;
-       char *user;
 
        if (lttng_is_setuid_setgid()) {
                ERR("'%s' is not allowed to be executed as a setuid/setgid binary for security reasons. Aborting.", argv[0]);
@@ -319,10 +344,9 @@ static int parse_args(int argc, char **argv)
                        ret = 0;
                        goto end;
                case 'h':
-                       ret = utils_show_man_page(1, "lttng");
-
+                       ret = utils_show_help(1, "lttng", help_msg);
                        if (ret) {
-                               ERR("Cannot view man page lttng(1)");
+                               ERR("Cannot show --help for `lttng`");
                                perror("exec");
                        }
                        goto end;
@@ -396,19 +420,19 @@ static int parse_args(int argc, char **argv)
        ret = handle_command(argc - optind, argv + optind);
        switch (ret) {
        case CMD_WARNING:
-               WARN("Some command(s) went wrong");
-               break;
        case CMD_ERROR:
-               ERR("Command error");
                break;
        case CMD_UNDEFINED:
-               ERR("Undefined command or invalid arguments");
+               if (!command_exists(*(argv + optind))) {
+                       MSG("lttng: %s is not an lttng command. See 'lttng --help'.",
+                                       *(argv + optind));
+               } else {
+                       ERR("Unrecognized argument used with \'%s\' command",
+                                       *(argv + optind));
+               }
                break;
        case CMD_FATAL:
-               ERR("Fatal error");
-               break;
        case CMD_UNSUPPORTED:
-               ERR("Unsupported command");
                break;
        case -1:
                ret = 1;