X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=bcfbf88e65aed6c701e5d2e2a458a1c2e9918dd0;hp=aa13bc45dd57f621e539b62d4e1aa6f401947767;hb=960afba4f737174cd305af2019d9c2c781ec6c4e;hpb=f67353ba14d7c2c860b4ed59247a38da77a481ce

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index aa13bc45d..bcfbf88e6 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -86,6 +86,7 @@ static struct cmd_struct commands[] =  {
 	{ "track", cmd_track},
 	{ "untrack", cmd_untrack},
 	{ "metadata", cmd_metadata},
+	{ "help", NULL},
 	{ NULL, NULL}	/* Array closure */
 };
 
@@ -216,8 +217,14 @@ static int handle_command(int argc, char **argv)
 		goto end;
 	}
 
+	/* Special case for help command which needs the commands array */
+	if (strcmp(argv[0], "help") == 0) {
+		ret = cmd_help(argc, (const char**) argv, commands);
+		goto end;
+	}
+
 	cmd = &commands[i];
-	while (cmd->func != NULL) {
+	while (cmd->name != NULL) {
 		/* Find command */
 		if (strcmp(argv[0], cmd->name) == 0) {
 			ret = cmd->func(argc, (const char**) argv);