X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=8e63a8997837079f2ef97a00ea9cfbe985f4a167;hp=e1e1564c16ebe9f0e3650a27ac80eac1d7c34638;hb=e20ca0249f0a7b3b8e2d8f50437e63ea17b8f6e9;hpb=6f04ed72990f6c72d16fd08d39feac0967da732e

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index e1e1564c1..8e63a8997 100644
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
@@ -26,7 +25,6 @@
 #include <unistd.h>
 
 #include "../command.h"
-#include <config.h>
 
 static char *opt_session_name;
 static char *opt_viewer;
@@ -34,6 +32,12 @@ static char *opt_trace_path;
 static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN;
 //static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN;
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-view.1.h>
+;
+#endif
+
 enum {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
@@ -80,30 +84,6 @@ static struct viewers {
 /* Is the session we are trying to view is in live mode. */
 static int session_live_mode;
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-	fprintf(ofp, "usage: lttng view [SESSION_NAME] [OPTIONS]\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "By default, the babeltrace viewer will be used for text viewing\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "Where SESSION_NAME is an optional session name. If not specified, lttng will\n");
-	fprintf(ofp, "get it from the configuration file (.lttngrc).\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, "  -t, --trace-path PATH    Trace directory path for the viewer\n");
-	fprintf(ofp, "  -e, --viewer CMD         Specify viewer and/or options to use\n");
-	fprintf(ofp, "                           This will completely override the default viewers so\n");
-	fprintf(ofp, "                           please make sure to specify the full command. The trace\n");
-	fprintf(ofp, "                           directory path of the session will be appended at the end\n");
-	fprintf(ofp, "                           to the arguments\n");
-	fprintf(ofp, "\n");
-}
-
 static struct viewers *parse_options(void)
 {
 	if (opt_viewer == NULL) {
@@ -111,12 +91,6 @@ static struct viewers *parse_options(void)
 		return &(viewers[VIEWER_BABELTRACE]);
 	}
 
-#if 0
-	if (strstr(opt_viewer, viewers[VIEWER_LTTV_GUI].exec_name) == 0) {
-		return &(viewers[VIEWER_LTTV_GUI]);
-	}
-#endif
-
 	/*
 	 * This means that if -e, --viewers is used, we just override everything
 	 * with it. For supported viewers like lttv, we could simply detect if "-t"
@@ -214,7 +188,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
 		goto error;
 	}
 
-	memcpy(argv, opts, size);
+	memcpy(argv, opts, sizeof(char *) * opts_len);
 
 	if (session_live_mode) {
 		argv[opts_len] = "-i";
@@ -258,17 +232,6 @@ static int spawn_viewer(const char *trace_path)
 		argv = alloc_argv_from_local_opts(babeltrace_opts,
 				ARRAY_SIZE(babeltrace_opts), trace_path);
 		break;
-#if 0
-	case VIEWER_LTTV_GUI:
-		if (stat(lttv_gui_bin, &status) == 0) {
-			viewer_bin = lttv_gui_bin;
-		} else {
-			viewer_bin = viewer->exec_name;
-		}
-		argv = alloc_argv_from_local_opts(lttv_gui_opts,
-				ARRAY_SIZE(lttv_gui_opts), trace_path);
-		break;
-#endif
 	case VIEWER_USER_DEFINED:
 		argv = alloc_argv_from_user_opts(opt_viewer, trace_path);
 		if (argv) {
@@ -282,7 +245,7 @@ static int spawn_viewer(const char *trace_path)
 		break;
 	}
 
-	if (argv == NULL) {
+	if (argv == NULL || !viewer_bin) {
 		ret = CMD_FATAL;
 		goto error;
 	}
@@ -296,12 +259,12 @@ static int spawn_viewer(const char *trace_path)
 		} else {
 			PERROR("exec: %s", viewer_bin);
 		}
-		free(argv);
 		ret = CMD_FATAL;
 		goto error;
 	}
 
 error:
+	free(argv);
 	return ret;
 }
 
@@ -339,6 +302,7 @@ static int view_trace(void)
 	int ret;
 	char *session_name, *trace_path = NULL;
 	struct lttng_session *sessions = NULL;
+	bool free_trace_path = false;
 
 	/*
 	 * Safety net. If lttng is suid at some point for *any* useless reasons,
@@ -416,6 +380,7 @@ static int view_trace(void)
 				ret = CMD_ERROR;
 				goto free_sessions;
 			}
+			free_trace_path = true;
 		} else {
 			/* Get file system session path. */
 			trace_path = sessions[i].path;
@@ -433,7 +398,7 @@ static int view_trace(void)
 	}
 
 free_sessions:
-	if (session_live_mode) {
+	if (session_live_mode && free_trace_path) {
 		free(trace_path);
 	}
 	free(sessions);
@@ -452,6 +417,7 @@ int cmd_view(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS;
 	static poptContext pc;
+	const char *leftover = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -463,13 +429,12 @@ int cmd_view(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stdout);
+			SHOW_HELP();
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
 			goto end;
 		default:
-			usage(stderr);
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
@@ -477,6 +442,13 @@ int cmd_view(int argc, const char **argv)
 
 	opt_session_name = (char*) poptGetArg(pc);
 
+	leftover = poptGetArg(pc);
+	if (leftover) {
+		ERR("Unknown argument: %s", leftover);
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	ret = view_trace();
 
 end: