From 70318c38123b5a56f6a62a4fa6662371cee2be33 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Sat, 11 May 2013 08:50:37 -0400 Subject: [PATCH] Add --version command-line option to lttng. Signed-off-by: Stefan Seefeld Signed-off-by: David Goulet --- src/bin/lttng/lttng.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c index 79a28ba82..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'}, @@ -85,6 +86,7 @@ static void usage(FILE *ofp) fprintf(ofp, "usage: lttng [OPTIONS] []\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; -- 2.34.1