From: David Goulet <dgoulet@efficios.com>
Date: Wed, 23 Jan 2013 17:25:24 +0000 (-0500)
Subject: Add mkdir_recursive function to libcommon utils
X-Git-Tag: v2.2.0-rc1~88
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2d85110833f3ffc12a62b3c13b39216d6fd769d8;p=lttng-tools.git

Add mkdir_recursive function to libcommon utils
---

diff --git a/src/common/utils.c b/src/common/utils.c
index 2f114934f..d8cb4a60f 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -22,6 +22,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <common/common.h>
 
@@ -232,3 +235,69 @@ int utils_create_pid_file(pid_t pid, const char *filepath)
 error:
 	return ret;
 }
+
+/*
+ * Recursively create directory using the given path and mode.
+ *
+ * On success, return 0 else a negative error code.
+ */
+__attribute__((visibility("hidden")))
+int utils_mkdir_recursive(const char *path, mode_t mode)
+{
+	char *p, tmp[PATH_MAX];
+	struct stat statbuf;
+	size_t len;
+	int ret;
+
+	assert(path);
+
+	ret = snprintf(tmp, sizeof(tmp), "%s", path);
+	if (ret < 0) {
+		PERROR("snprintf mkdir");
+		goto error;
+	}
+
+	len = ret;
+	if (tmp[len - 1] == '/') {
+		tmp[len - 1] = 0;
+	}
+
+	for (p = tmp + 1; *p; p++) {
+		if (*p == '/') {
+			*p = 0;
+			if (tmp[strlen(tmp) - 1] == '.' &&
+					tmp[strlen(tmp) - 2] == '.' &&
+					tmp[strlen(tmp) - 3] == '/') {
+				ERR("Using '/../' is not permitted in the trace path (%s)",
+						tmp);
+				ret = -1;
+				goto error;
+			}
+			ret = stat(tmp, &statbuf);
+			if (ret < 0) {
+				ret = mkdir(tmp, mode);
+				if (ret < 0) {
+					if (errno != EEXIST) {
+						PERROR("mkdir recursive");
+						ret = -errno;
+						goto error;
+					}
+				}
+			}
+			*p = '/';
+		}
+	}
+
+	ret = mkdir(tmp, mode);
+	if (ret < 0) {
+		if (errno != EEXIST) {
+			PERROR("mkdir recursive last piece");
+			ret = -errno;
+		} else {
+			ret = 0;
+		}
+	}
+
+error:
+	return ret;
+}
diff --git a/src/common/utils.h b/src/common/utils.h
index 95e1b6707..f63e84e5b 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -25,5 +25,6 @@ void utils_close_pipe(int *src);
 char *utils_strdupdelim(const char *begin, const char *end);
 int utils_set_fd_cloexec(int fd);
 int utils_create_pid_file(pid_t pid, const char *filepath);
+int utils_mkdir_recursive(const char *path, mode_t mode);
 
 #endif /* _COMMON_UTILS_H */