X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fversion.c;h=4e46d724f10941400be812e7582aa4d60750a869;hp=0ab31b637bef4ee85836247a14dcee7a20ddc12d;hb=ceb6ba5100c73f6a2b39475c89f3317d64fc9b48;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c
index 0ab31b637..4e46d724f 100644
--- a/src/bin/lttng/commands/version.c
+++ b/src/bin/lttng/commands/version.c
@@ -25,6 +25,8 @@
 #include <unistd.h>
 #include <config.h>
 
+#include <common/mi-lttng.h>
+
 #include "../command.h"
 
 enum {
@@ -32,6 +34,8 @@ enum {
 	OPT_LIST_OPTIONS,
 };
 
+static const char *lttng_license = "lttng is free software and under the GPL license and part LGPL";
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -44,13 +48,93 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng version\n");
+	fprintf(ofp, "usage: lttng version [OPTIONS]\n");
 	fprintf(ofp, "\n");
+	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
 	fprintf(ofp, "      --list-options       Simple listing of options\n");
 	fprintf(ofp, "\n");
 }
 
+/*
+ *  create_version
+ */
+static void create_version(struct mi_lttng_version *version)
+{
+	strncpy(version->version, VERSION, NAME_MAX);
+	version->version_major = VERSION_MAJOR;
+	version->version_minor = VERSION_MINOR;
+	version->version_patchlevel = VERSION_PATCHLEVEL;
+	strncpy(version->version_commit, GIT_VERSION, NAME_MAX);
+	strncpy(version->version_name, VERSION_NAME, NAME_MAX);
+	strncpy(version->package_url, PACKAGE_URL, NAME_MAX);
+}
+
+/*
+ * Print the machine interface output of this command.
+ */
+static int print_mi()
+{
+	int ret = CMD_SUCCESS;
+	struct mi_writer *writer = NULL;
+	struct mi_lttng_version version;
+
+	create_version(&version);
+
+	writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
+	if (!writer) {
+		ret = -LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	/* Open the command element */
+	ret = mi_lttng_writer_command_open(writer,
+			mi_lttng_element_command_version);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto error;
+	}
+
+	/* Beginning of output */
+	ret = mi_lttng_writer_open_element(writer,
+			mi_lttng_element_command_output);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto error;
+	}
+
+	/* Print the machine interface of version */
+	ret = mi_lttng_version(writer, &version,
+			VERSION_DESCRIPTION, lttng_license);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto error;
+	}
+
+	/* Close the output element */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto error;
+	}
+
+	/* Close the command  */
+	ret = mi_lttng_writer_command_close(writer);
+	if (ret) {
+		ret = CMD_ERROR;
+	}
+
+error:
+	/* Cleanup */
+	if (writer && mi_lttng_writer_destroy(writer)) {
+		/* Preserve original error code */
+		ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
+	}
+
+end:
+	return ret;
+}
+
 /*
  *  cmd_version
  */
@@ -77,9 +161,14 @@ int cmd_version(int argc, const char **argv)
 		}
 	}
 
-	MSG("lttng version " VERSION);
-	MSG("Web site: http://lttng.org/");
-	MSG("\nlttng is free software and under the GPL license.");
+	if (lttng_opt_mi) {
+		ret = print_mi();
+	} else {
+		MSG("lttng version " VERSION " - " VERSION_NAME GIT_VERSION_PREFIX GIT_VERSION);
+		MSG("\n" VERSION_DESCRIPTION "\n");
+		MSG("Web site: http://lttng.org");
+		MSG("\n%s", lttng_license);
+	}
 
 end:
 	poptFreeContext(pc);