X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsave.c;h=924ddcbcd6bef1f2c4faf43524e60c0a31ce8124;hp=d90ae06344179d8013e398c59a2a4c57e00049d5;hb=54185c70692f8a6d9c667214743e0ffd07a0afa3;hpb=1734c658bc988376ddf880872e9d37160edea133

diff --git a/src/bin/lttng/commands/save.c b/src/bin/lttng/commands/save.c
index d90ae0634..924ddcbcd 100644
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
 #include <stdio.h>
@@ -29,40 +29,33 @@
 #include <lttng/save.h>
 
 static char *opt_output_path;
-static int opt_force;
-static int opt_save_all;
+static bool opt_force;
+static bool opt_save_all;
+static struct mi_writer *writer;
+
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-save.1.h>
+;
+#endif
 
 enum {
 	OPT_HELP = 1,
 	OPT_ALL,
 	OPT_FORCE,
+	OPT_LIST_OPTIONS,
 };
 
 static struct poptOption save_opts[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",        'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"all",         'a', POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
-	{"output-path", 'o', POPT_ARG_STRING, &opt_output_path, 0, 0, 0},
-	{"force",       'f', POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
+	{"help",        'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
+	{"all",         'a', POPT_ARG_NONE, NULL, OPT_ALL, NULL, NULL},
+	{"output-path", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
+	{"force",       'f', POPT_ARG_NONE, NULL, OPT_FORCE, NULL, NULL},
+	{"list-options",  0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
-static struct mi_writer *writer;
-
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-	fprintf(ofp, "usage: lttng save [OPTIONS] [SESSION]\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "Options:\n");
-	fprintf(ofp, "  -h, --help           Show this help\n");
-	fprintf(ofp, "  -a, --all            Save all sessions (default)\n");
-	fprintf(ofp, "  -o, --output-path    Output path of the session configuration(s)\n");
-	fprintf(ofp, "  -f, --force          Overwrite existing session configuration(s)\n");
-}
-
 static int mi_partial_session(const char *session_name)
 {
 	int ret;
@@ -134,7 +127,7 @@ int cmd_save(int argc, const char **argv)
 {
 	int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success;
 	int opt;
-	const char *session_name = NULL;
+	const char *session_name = NULL, *leftover = NULL;
 	poptContext pc;
 	struct lttng_save_session_attr *attr;
 
@@ -144,16 +137,18 @@ int cmd_save(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stdout);
+			SHOW_HELP();
 			goto end;
 		case OPT_ALL:
-			opt_save_all = 1;
+			opt_save_all = true;
 			break;
 		case OPT_FORCE:
-			opt_force = 1;
+			opt_force = true;
 			break;
+		case OPT_LIST_OPTIONS:
+			list_cmd_options(stdout, save_opts);
+			goto end;
 		default:
-			usage(stderr);
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
@@ -165,10 +160,17 @@ int cmd_save(int argc, const char **argv)
 			DBG2("Session name: %s", session_name);
 		} else {
 			/* default to opt_save_all */
-			opt_save_all = 1;
+			opt_save_all = true;
 		}
 	}
 
+	leftover = poptGetArg(pc);
+	if (leftover) {
+		ERR("Unknown argument: %s", leftover);
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	attr = lttng_save_session_attr_create();
 	if (!attr) {
 		ret = CMD_FATAL;