X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=9975a11465f46bc63e555f026e860d1ee93e6259;hb=e86cd8cd7bea21b59a264d0760c3726d4f0eff43;hp=2df8b8740225afc831c5769779473c0db5140f51;hpb=4c6ac053271850d24b2eda44a78f066c332880e1;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 2df8b8740..9975a1146 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -83,8 +83,6 @@ static struct cmd_struct commands[] =  {
 	{ "snapshot", cmd_snapshot},
 	{ "save", cmd_save},
 	{ "load", cmd_load},
-	{ "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */
-	{ "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */
 	{ NULL, NULL}	/* Array closure */
 };
 
@@ -444,6 +442,7 @@ static int check_args_no_sessiond(int argc, char **argv)
 static int parse_args(int argc, char **argv)
 {
 	int opt, ret;
+	char *user;
 
 	if (argc < 2) {
 		usage(stderr);
@@ -484,9 +483,17 @@ static int parse_args(int argc, char **argv)
 			break;
 		case OPT_SESSION_PATH:
 			opt_sessiond_path = strdup(optarg);
+			if (!opt_sessiond_path) {
+				ret = -1;
+				goto error;
+			}
 			break;
 		case OPT_RELAYD_PATH:
 			opt_relayd_path = strdup(optarg);
+			if (!opt_relayd_path) {
+				ret = -1;
+				goto error;
+			}
 			break;
 		case OPT_DUMP_OPTIONS:
 			list_options(stdout);
@@ -522,6 +529,14 @@ 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.
@@ -568,18 +583,9 @@ error:
 int main(int argc, char *argv[])
 {
 	int ret;
-	char *user;
 
 	progname = argv[0] ? argv[0] : "lttng";
 
-	/* 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 */
-
 	ret = set_signal_handler();
 	if (ret < 0) {
 		clean_exit(ret);