X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=d905af9a683a6ad57c14acbd0f41687aefa30bb0;hp=02903becdab2ca4783b147d3e060063f1e460855;hb=dd73d57bb95fae31161ca0781108d166082a06f5;hpb=9fb6c2dbea6c22a5f047ec90575e0b8a053db393

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 02903becd..d905af9a6 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -33,6 +33,14 @@
 
 #include "command.h"
 
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
+
 /* Variables */
 static char *progname;
 int opt_no_sessiond;
@@ -66,7 +74,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 +84,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,7 +96,6 @@ static struct cmd_struct commands[] =  {
 	{ "stop", cmd_stop},
 	{ "track", cmd_track},
 	{ "untrack", cmd_untrack},
-	{ "help", NULL},
 	{ "version", cmd_version},
 	{ "view", cmd_view},
 	{ NULL, NULL}	/* Array closure */
@@ -253,7 +263,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("");
@@ -280,7 +290,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);
@@ -299,7 +308,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]);
@@ -318,10 +326,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;
@@ -348,6 +355,7 @@ static int parse_args(int argc, char **argv)
 			opt_no_sessiond = 1;
 			break;
 		case OPT_SESSION_PATH:
+			free(opt_sessiond_path);
 			opt_sessiond_path = strdup(optarg);
 			if (!opt_sessiond_path) {
 				ret = -1;
@@ -355,6 +363,7 @@ static int parse_args(int argc, char **argv)
 			}
 			break;
 		case OPT_RELAYD_PATH:
+			free(opt_relayd_path);
 			opt_relayd_path = strdup(optarg);
 			if (!opt_relayd_path) {
 				ret = -1;
@@ -386,14 +395,6 @@ static int parse_args(int argc, char **argv)
 		goto error;
 	}
 
-	/* For Mathieu Desnoyers a.k.a. Dr. Tracing */
-	user = getenv("USER");
-	if (user != NULL && ((strncmp(progname, "drtrace", 7) == 0 ||
-					strncmp("compudj", user, 7) == 0))) {
-		MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0);
-	}
-	/* Thanks Mathieu */
-
 	/*
 	 * Handle leftovers which is a first level command with the trailing
 	 * options.