From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Wed, 30 Nov 2016 20:40:43 +0000 (-0500)
Subject: lttng help: use command's --help directly
X-Git-Tag: v2.10.0-rc1~32
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6828df297bdebf234beb347aabcbb1aa596d1212;p=lttng-tools.git

lttng help: use command's --help directly

Do the same thing for both `lttng cmd --help` and
`lttng help cmd`, so that if we change what's done, the
behaviour remains the same for both methods.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/commands/help.c b/src/bin/lttng/commands/help.c
index 5db141959..6e80571e3 100644
--- a/src/bin/lttng/commands/help.c
+++ b/src/bin/lttng/commands/help.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "../command.h"
 #include <common/utils.h>
@@ -62,6 +63,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);
@@ -95,6 +97,12 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[])
 		goto end;
 	}
 
+	/* Help about help? */
+	if (strcmp(cmd_name, "help") == 0) {
+		SHOW_HELP();
+		goto end;
+	}
+
 	/* Make sure command name exists */
 	cmd = &commands[0];
 
@@ -113,14 +121,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);