X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=c5198bda1b144784e1e42670458491d6fa22bec2;hb=da3c9ec137aaec74635ca1f5584040c20b1d3d7b;hp=90c031fafaaf655cd124d494ef207e2ba8b7c0c2;hpb=4ce78777c3ffcdd42e635ed45aa5dd3a7c7bd22d;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 90c031faf..c5198bda1 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -47,6 +47,7 @@ enum {
 
 /* Getopt options. No first level command. */
 static struct option long_options[] = {
+	{"version",          0, NULL, 'V'},
 	{"help",             0, NULL, 'h'},
 	{"group",            1, NULL, 'g'},
 	{"verbose",          0, NULL, 'v'},
@@ -74,8 +75,8 @@ static struct cmd_struct commands[] =  {
 	{ "version", cmd_version},
 	{ "calibrate", cmd_calibrate},
 	{ "view", cmd_view},
-	{ "enable-consumer", cmd_enable_consumer}, /* OBSELETE */
-	{ "disable-consumer", cmd_disable_consumer}, /*OBSELETE */
+	{ "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */
+	{ "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */
 	{ NULL, NULL}	/* Array closure */
 };
 
@@ -85,6 +86,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND> [<ARGS>]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
+	fprintf(ofp, "  -V, --version              Show version\n");
 	fprintf(ofp, "  -h, --help                 Show this help\n");
 	fprintf(ofp, "      --list-options         Simple listing of lttng options\n");
 	fprintf(ofp, "      --list-commands        Simple listing of lttng commands\n");
@@ -116,6 +118,12 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "See http://lttng.org for updates, bug reports and news.\n");
 }
 
+static void version(FILE *ofp)
+{
+	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME"\n",
+			progname);
+}
+
 /*
  *  list_options
  *
@@ -426,8 +434,12 @@ static int parse_args(int argc, char **argv)
 		clean_exit(EXIT_FAILURE);
 	}
 
-	while ((opt = getopt_long(argc, argv, "+hnvqg:", long_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "+Vhnvqg:", long_options, NULL)) != -1) {
 		switch (opt) {
+		case 'V':
+			version(stdout);
+			ret = 0;
+			goto end;
 		case 'h':
 			usage(stdout);
 			ret = 0;