X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=8ae984836595d1271b0a38a8809e2e5f5e0d88b9;hb=94dd71b967efa722af734ee067025ef11011a3c8;hp=1f491db1b89e0095d33ce7ee603338f4f7f400c2;hpb=3183dbb0b0a687ececcadb3be0cde938dc19f57a;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index 1f491db1b..8ae984836 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -1,10 +1,9 @@
 /*
  * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,14 +15,64 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <stdlib.h>
 #include <ctype.h>
+#include <limits.h>
 
 #include <common/error.h>
 
 #include "conf.h"
 #include "utils.h"
 
+/*
+ * Return the realpath(3) of the path even if the last directory token does not
+ * exist. For example, with /tmp/test1/test2, if test2/ does not exist but the
+ * /tmp/test1 does, the real path is returned. In normal time, realpath(3)
+ * fails if the end point directory does not exist.
+ */
+char *expand_full_path(const char *path)
+{
+	const char *end_path = path;
+	char *next, *cut_path, *expanded_path;
+
+	/* Find last token delimited by '/' */
+	while ((next = strpbrk(end_path + 1, "/"))) {
+		end_path = next;
+	}
+
+	/* Cut last token from original path */
+	cut_path = strndup(path, end_path - path);
+
+	expanded_path = malloc(PATH_MAX);
+	if (expanded_path == NULL) {
+		goto error;
+	}
+
+	expanded_path = realpath((char *)cut_path, expanded_path);
+	if (expanded_path == NULL) {
+		switch (errno) {
+		case ENOENT:
+			ERR("%s: No such file or directory", cut_path);
+			break;
+		default:
+			perror("realpath");
+			break;
+		}
+		goto error;
+	}
+
+	/* Add end part to expanded path */
+	strcat(expanded_path, end_path);
+
+	free(cut_path);
+	return expanded_path;
+
+error:
+	free(cut_path);
+	return NULL;
+}
+
 /*
  *  get_session_name
  *