X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=75a46760644b848d7a81fd1188b05b126a79a9e0;hb=cbbb813a7c2d17a7df2c107f807d1826d45a34fc;hp=8ddba13f4384af3e069608d7f6b4340ea664389c;hpb=4222434939b65c3abf144866564732d7fd14ed13;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 8ddba13f4..75a467606 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -79,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");
@@ -519,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) {