X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fhelp.c;h=af46296ce515e0ae070610c5184baa6e0148882f;hb=0d5a66ffc18fe9abe115c66b664df71084ad1fc6;hp=29f56bab1778f3dd38ce5186bc5da6a21b7ebc7e;hpb=960afba4f737174cd305af2019d9c2c781ec6c4e;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/help.c b/src/bin/lttng/commands/help.c
index 29f56bab1..af46296ce 100644
--- a/src/bin/lttng/commands/help.c
+++ b/src/bin/lttng/commands/help.c
@@ -20,10 +20,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "../command.h"
 #include <common/utils.h>
 
+#ifdef LTTNG_EMBED_HELP
+static const char *help_msg =
+#include <lttng-help.1.h>
+;
+#endif
+
+static const char *lttng_help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
+
 enum {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
@@ -46,6 +61,7 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[])
 	static poptContext pc;
 	const struct cmd_struct *cmd;
 	int found = 0;
+	const char *cmd_argv[2];
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -69,14 +85,20 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[])
 
 	if (cmd_name == NULL) {
 		/* Fall back to lttng(1) */
-		ret = utils_show_man_page(1, "lttng");
-
+		ret = utils_show_help(1, "lttng", lttng_help_msg);
 		if (ret) {
-			ERR("Cannot view man page lttng(1)");
+			ERR("Cannot show --help for `lttng`");
 			perror("exec");
 			ret = CMD_ERROR;
-			goto end;
 		}
+
+		goto end;
+	}
+
+	/* Help about help? */
+	if (strcmp(cmd_name, "help") == 0) {
+		SHOW_HELP();
+		goto end;
 	}
 
 	/* Make sure command name exists */
@@ -97,14 +119,11 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[])
 		goto end;
 	}
 
-	/* Show command's man page */
-	ret = show_cmd_man_page(cmd_name);
-
-	if (ret) {
-		ERR("Cannot view man page lttng-%s(1)", cmd_name);
-		perror("exec");
-		ret = CMD_ERROR;
-	}
+	/* Show command's help */
+	cmd_argv[0] = cmd->name;
+	cmd_argv[1] = "--help";
+	assert(cmd->func);
+	ret = cmd->func(2, cmd_argv);
 
 end:
 	poptFreeContext(pc);