lttng.c: CMD_UNDEFINED is used for invalid args too

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

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index bf07c83b76058219e88ceb1c41b41122242252d2..7ab1125e3240fad20a37babb74ebfdb15c6245f2 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <getopt.h>
 #include <signal.h>
@@ -25,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <config.h>
 #include <ctype.h>
 
 #include <lttng/lttng.h>
@@ -67,6 +65,7 @@ static struct option long_options[] = {
 /* First level command */
 static struct cmd_struct commands[] =  {
        { "list", cmd_list},
+       { "status", cmd_status},
        { "create", cmd_create},
        { "destroy", cmd_destroy},
        { "start", cmd_start},
@@ -85,6 +84,7 @@ static struct cmd_struct commands[] =  {
        { "load", cmd_load},
        { "track", cmd_track},
        { "untrack", cmd_untrack},
+       { "metadata", cmd_metadata},
        { NULL, NULL}   /* Array closure */
 };
 
@@ -121,6 +121,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "    set-session       Set current session name\n");
        fprintf(ofp, "    snapshot          Snapshot buffers of current session name\n");
        fprintf(ofp, "    start             Start tracing\n");
+       fprintf(ofp, "    status            Show current session's details\n");
        fprintf(ofp, "    stop              Stop tracing\n");
        fprintf(ofp, "    version           Show version information\n");
        fprintf(ofp, "    view              Start trace viewer\n");
@@ -128,6 +129,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "    load              Load session configuration\n");
        fprintf(ofp, "    track             Track specific system resources\n");
        fprintf(ofp, "    untrack           Untrack specific system resources\n");
+       fprintf(ofp, "    metadata          Regenerate the metadata of a session\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Each command also has its own -h, --help option.\n");
        fprintf(ofp, "\n");
@@ -394,7 +396,7 @@ static int parse_args(int argc, char **argv)
                ERR("Command error");
                break;
        case CMD_UNDEFINED:
-               ERR("Undefined command");
+               ERR("Undefined command or invalid arguments");
                break;
        case CMD_FATAL:
                ERR("Fatal error");