X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=7900ea2de5347c1236b8db1bdc346f1586f72637;hp=09acc30f42d20803a993c4a777a8496e976b9b74;hb=4516725604815ed65eccbe5dba16706e7b3ccde0;hpb=38b4ef1b199ddb15db78774a39e9c524ca7e2d24

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index 09acc30f4..7900ea2de 100644
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -30,7 +30,12 @@ static char *opt_session_name;
 static char *opt_viewer;
 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,
@@ -50,7 +55,6 @@ static struct poptOption long_options[] = {
  * This is needed for each viewer since we are using execvp().
  */
 static const char *babeltrace_opts[] = { "babeltrace" };
-//static const char *lttv_gui_opts[] = { "lttv-gui", "-t", };
 
 /*
  * Type is also use as the index in the viewers array. So please, make sure
@@ -58,27 +62,25 @@ static const char *babeltrace_opts[] = { "babeltrace" };
  */
 enum viewer_type {
 	VIEWER_BABELTRACE    = 0,
-	VIEWER_LTTV_GUI      = 1,
-	VIEWER_USER_DEFINED  = 2,
+	VIEWER_USER_DEFINED  = 1,
 };
 
 /*
  * NOTE: "lttv" is a shell command and it's not working for exec() family
  * functions so we might think of removing this wrapper or using bash.
  */
-static struct viewers {
+static const struct viewers {
 	const char *exec_name;
 	enum viewer_type type;
 } viewers[] = {
 	{ "babeltrace", VIEWER_BABELTRACE },
-	{ "lttv-gui", VIEWER_LTTV_GUI },
 	{ NULL, VIEWER_USER_DEFINED },
 };
 
 /* Is the session we are trying to view is in live mode. */
 static int session_live_mode;
 
-static struct viewers *parse_options(void)
+static const struct viewers *parse_options(void)
 {
 	if (opt_viewer == NULL) {
 		/* Default is babeltrace */
@@ -182,7 +184,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";
@@ -206,7 +208,7 @@ static int spawn_viewer(const char *trace_path)
 	int ret = 0;
 	struct stat status;
 	const char *viewer_bin = NULL;
-	struct viewers *viewer;
+	const struct viewers *viewer;
 	char **argv = NULL;
 
 	/* Check for --viewer options */
@@ -253,12 +255,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;
 }
 
@@ -296,6 +298,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,
@@ -373,6 +376,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;
@@ -390,7 +394,7 @@ static int view_trace(void)
 	}
 
 free_sessions:
-	if (session_live_mode) {
+	if (session_live_mode && free_trace_path) {
 		free(trace_path);
 	}
 	free(sessions);
@@ -409,6 +413,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);
@@ -433,6 +438,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: