X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=75a46760644b848d7a81fd1188b05b126a79a9e0;hb=d386b2341d96bbeeb1f89071614506c0ddbb9bcc;hp=10b5d191e84dc068a0ed713760990ac4e798ce27;hpb=97e190465f6a2a7d5bf72f445bb4d9d8544a0916;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 10b5d191e..75a467606 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -2,9 +2,8 @@
  * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -80,7 +79,7 @@ static struct cmd_struct commands[] =  {
 
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "LTTng Trace Control " VERSION"\n\n");
+	fprintf(ofp, "LTTng Trace Control " VERSION" - " VERSION_NAME"\n\n");
 	fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
@@ -502,7 +501,9 @@ static int parse_args(int argc, char **argv)
 	case 0:
 		break;
 	default:
-		ERR("%s", lttng_strerror(ret));
+		if (ret < 0) {
+			ret = -ret;
+		}
 		break;
 	}
 
@@ -518,14 +519,17 @@ 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 */
-	if (strncmp(progname, "drtrace", 7) == 0 ||
-			strncmp("compudj", getenv("USER"), 7) == 0) {
+	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) {