X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-crash%2Flttng-crash.c;h=653e4d0a6667e88fcc4dc74a49e1885897099874;hb=8190767eb2133d712c22d87a26efa4790ec9dd3a;hp=5ca85f3bd01dcc6bdb2a5a4121a07592c09d11d0;hpb=afe4fd7ca14c0ae4f36f034aa69e0e7a9cdf1b4b;p=lttng-tools.git

diff --git a/src/bin/lttng-crash/lttng-crash.c b/src/bin/lttng-crash/lttng-crash.c
index 5ca85f3bd..653e4d0a6 100644
--- a/src/bin/lttng-crash/lttng-crash.c
+++ b/src/bin/lttng-crash/lttng-crash.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <getopt.h>
 #include <signal.h>
 #include <stdio.h>
@@ -29,7 +28,6 @@
 #include <fcntl.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <config.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <byteswap.h>
@@ -184,8 +182,8 @@ struct lttng_crash_layout {
 
 /* Variables */
 static char *progname,
-	*opt_viewer_path = DEFAULT_VIEWER,
-	*opt_output_path;
+	*opt_viewer_path = NULL,
+	*opt_output_path = NULL;
 
 static char *input_path;
 
@@ -275,7 +273,7 @@ static int parse_args(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	while ((opt = getopt_long(argc, argv, "+Vhvex:", long_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "+Vhve:x:", long_options, NULL)) != -1) {
 		switch (opt) {
 		case 'V':
 			version(stdout);
@@ -292,9 +290,11 @@ static int parse_args(int argc, char **argv)
 			}
 			break;
 		case 'e':
+			free(opt_viewer_path);
 			opt_viewer_path = strdup(optarg);
 			break;
 		case 'x':
+			free(opt_output_path);
 			opt_output_path = strdup(optarg);
 			break;
 		case OPT_DUMP_OPTIONS:
@@ -307,6 +307,10 @@ static int parse_args(int argc, char **argv)
 		}
 	}
 
+	if (!opt_viewer_path) {
+		opt_viewer_path = DEFAULT_VIEWER;
+	}
+
 	/* No leftovers, or more than one input path, print usage and quit */
 	if ((argc - optind) == 0 || (argc - optind) > 1) {
 		usage(stderr);
@@ -662,7 +666,7 @@ int copy_crash_subbuf(const struct lttng_crash_layout *layout,
 		return -EINVAL;
 	}
 
-	DBG("Copy crash subbuffer at offset %lu", offset);
+	DBG("Copy crash subbuffer at offset %" PRIu64, offset);
 	sbidx = subbuf_index(offset, buf_size, subbuf_size);
 
 	/*
@@ -1028,6 +1032,7 @@ int extract_trace_recursive(const char *output_path,
 			break;
 		}
 		case DT_REG:
+		case DT_LNK:
 			if (!strcmp(entry->d_name, "metadata")) {
 				ret = extract_one_trace(output_path,
 					input_path);