X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsave.c;h=4ba90243698c9c13e50b3efc93dc1b57ab98c48d;hb=491d15395b58df09f8a3e7ba7404eb1f46392b79;hp=66ec5b6ebe904f5c2ec0ff33bb32598226b367ab;hpb=4ba92f185fb1d0b112cbc804a261939f5f81dc34;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/save.c b/src/bin/lttng/commands/save.c
index 66ec5b6eb..4ba902436 100644
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -29,8 +29,15 @@
 #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,
@@ -41,30 +48,14 @@ enum {
 
 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;
@@ -149,16 +140,15 @@ int cmd_save(int argc, const char **argv)
 			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;
 		}
@@ -170,7 +160,7 @@ 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;
 		}
 	}