X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=ce25f232d5209b7c08b644ce21a7fa526d70a244;hb=1eb682be3330c00ac2ee60a596dda4eb440e3784;hp=3a4f850ba66b22f19d78bdbd9dd52e1257d8ba75;hpb=664958450af7685c38cccfc9109d8f5b050e0fd9;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 3a4f850ba..ce25f232d 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -178,6 +178,8 @@ LTTNG_HIDDEN
 char *utils_expand_path(const char *path)
 {
 	char *next, *previous, *slash, *start_path, *absolute_path = NULL;
+	char *last_token;
+	int is_dot, is_dotdot;
 
 	/* Safety net */
 	if (path == NULL) {
@@ -198,7 +200,7 @@ char *utils_expand_path(const char *path)
 	if (*path != '/' && strncmp(path, "./", 2) != 0 &&
 			strncmp(path, "../", 3) != 0) {
 		snprintf(absolute_path, PATH_MAX, "./%s", path);
-		/* Else, we just copy the path */
+	/* Else, we just copy the path */
 	} else {
 		strncpy(absolute_path, path, PATH_MAX);
 	}
@@ -241,6 +243,31 @@ char *utils_expand_path(const char *path)
 				absolute_path, PATH_MAX);
 	}
 
+	/* Identify the last token */
+	last_token = strrchr(absolute_path, '/');
+
+	/* Verify that this token is not a relative path */
+	is_dotdot = (strcmp(last_token, "/..") == 0);
+	is_dot = (strcmp(last_token, "/.") == 0);
+
+	/* If it is, take action */
+	if (is_dot || is_dotdot) {
+		/* For both, remove this token */
+		*last_token = '\0';
+
+		/* If it was a reference to parent directory, go back one more time */
+		if (is_dotdot) {
+			last_token = strrchr(absolute_path, '/');
+
+			/* If there was only one level left, we keep the first '/' */
+			if (last_token == absolute_path) {
+				last_token++;
+			}
+
+			*last_token = '\0';
+		}
+	}
+
 	return absolute_path;
 
 error: