X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=44e0cb015c93e90bc31cc553bead112f368602cd;hp=37fb4b8bc3a867ee06ff3e52b3c9155a7069e1a6;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hpb=6c1c0768320135c6936c371b09731851b508c023

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index 37fb4b8bc..44e0cb015 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;
@@ -111,12 +109,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"
@@ -152,7 +144,7 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 	} while (*token != '\0');
 
 	/* Add two here for the NULL terminating element and trace path */
-	argv = malloc(sizeof(char *) * (num_opts + 2));
+	argv = zmalloc(sizeof(char *) * (num_opts + 2));
 	if (argv == NULL) {
 		goto error;
 	}
@@ -160,6 +152,9 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 	token = strtok(opts, " ");
 	while (token != NULL) {
 		argv[i] = strdup(token);
+		if (argv[i] == NULL) {
+			goto error;
+		}
 		token = strtok(NULL, " ");
 		i++;
 	}
@@ -170,6 +165,13 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 	return argv;
 
 error:
+	if (argv) {
+		for (i = 0; i < num_opts + 2; i++) {
+			free(argv[i]);
+		}
+		free(argv);
+	}
+
 	return NULL;
 }
 
@@ -199,7 +201,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
 	size = sizeof(char *) * mem_len;
 
 	/* Add two here for the trace_path and the NULL terminating element. */
-	argv = malloc(size);
+	argv = zmalloc(size);
 	if (argv == NULL) {
 		goto error;
 	}
@@ -248,17 +250,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) {
@@ -272,7 +263,7 @@ static int spawn_viewer(const char *trace_path)
 		break;
 	}
 
-	if (argv == NULL) {
+	if (argv == NULL || !viewer_bin) {
 		ret = CMD_FATAL;
 		goto error;
 	}
@@ -306,14 +297,14 @@ static char *build_live_path(char *session_name)
 
 	ret = gethostname(hostname, sizeof(hostname));
 	if (ret < 0) {
-		perror("gethostname");
+		PERROR("gethostname");
 		goto error;
 	}
 
 	ret = asprintf(&path, "net://localhost/host/%s/%s", hostname,
 			session_name);
 	if (ret < 0) {
-		perror("asprintf live path");
+		PERROR("asprintf live path");
 		goto error;
 	}