Initial import of the new binary lttng-relayd

[lttng-tools.git] / src / bin / lttng / lttng.c

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 61d31bf43199c9238e9774ed88225a35d6ddf51d..75a46760644b848d7a81fd1188b05b126a79a9e0 100644 (file)
--- 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");
@@ -501,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;
        }
 
@@ -517,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) {