X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=dcbffeb74c438e5b8a725a798c3e972506e4b856;hb=8ff7624a471a53c1461e6c327ab62ef703feb174;hp=02903becdab2ca4783b147d3e060063f1e460855;hpb=9fb6c2dbea6c22a5f047ec90575e0b8a053db393;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 02903becd..dcbffeb74 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -66,7 +66,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},
@@ -88,14 +87,16 @@ static struct cmd_struct commands[] =  {
 	{ "help", NULL},
 	{ "version", cmd_version},
 	{ "view", cmd_view},
+	{ "regenerate", cmd_regenerate},
 	{ NULL, NULL}	/* Array closure */
 };
 
 static void version(FILE *ofp)
 {
-	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s%s\n",
 			progname,
-			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+			EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -253,7 +254,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 +281,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 +299,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]);
@@ -348,6 +347,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 +355,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 +387,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.