X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fversion.c;h=9f606bf44396bcad8a8e60dfc54662a044356f3d;hp=f288ba4aa971e30e1e9c615f1f4dd629664b07ce;hb=0de2479d5f5a287d31c69e34ea5202a69019f224;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253

diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c
index f288ba4aa..9f606bf44 100644
--- a/src/bin/lttng/commands/version.c
+++ b/src/bin/lttng/commands/version.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,15 +13,25 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <config.h>
+
+#include <common/mi-lttng.h>
 
 #include "../command.h"
+#include "version.h"
+
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-version.1.h>
+;
+#endif
 
 enum {
 	OPT_HELP = 1,
 	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},
@@ -41,15 +40,82 @@ static struct poptOption long_options[] = {
 };
 
 /*
- * usage
+ *  create_version
  */
-static void usage(FILE *ofp)
+static void create_version(struct mi_lttng_version *version)
 {
-	fprintf(ofp, "usage: lttng version\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "  -h, --help               Show this help\n");
-	fprintf(ofp, "      --list-options       Simple listing of options\n");
-	fprintf(ofp, "\n");
+	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(void)
+{
+	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;
 }
 
 /*
@@ -66,24 +132,37 @@ int cmd_version(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
-			ret = CMD_SUCCESS;
+			SHOW_HELP();
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
-			usage(stderr);
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
 	}
 
-	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 "%s",
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+		MSG("\n" VERSION_DESCRIPTION "\n");
+		MSG("Web site: https://lttng.org");
+		MSG("\n%s", lttng_license);
+		if (EXTRA_VERSION_NAME[0] != '\0') {
+			MSG("\nExtra version name: " EXTRA_VERSION_NAME);
+		}
+		if (EXTRA_VERSION_DESCRIPTION[0] != '\0') {
+			MSG("\nExtra version description:\n\t" EXTRA_VERSION_DESCRIPTION);
+		}
+		if (EXTRA_VERSION_PATCHES[0] != '\0') {
+			MSG("\nExtra version patches:\n\t" EXTRA_VERSION_PATCHES);
+		}
+	}
 
 end:
+	poptFreeContext(pc);
 	return ret;
 }