X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Futils.c;h=6b22d9693c693e59bfd389d273b9d1aee5dc2974;hp=d099c08031abf96221ac3028f3048fe4cd6ff266;hb=050349bbb362ea993533591532643022efeab864;hpb=b082db07f0c522527fc95fc97f3e99eb0579c0cc

diff --git a/ltt-sessiond/utils.c b/ltt-sessiond/utils.c
index d099c0803..6b22d9693 100644
--- a/ltt-sessiond/utils.c
+++ b/ltt-sessiond/utils.c
@@ -1,10 +1,11 @@
 /*
- * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * 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; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +30,9 @@
 #include "utils.h"
 
 /*
- *  get_home_dir
+ * Return pointer to home directory path using the env variable HOME.
  *
- *  Return pointer to home directory path using the env variable HOME.
- *  No home, NULL is returned.
+ * No home, NULL is returned.
  */
 const char *get_home_dir(void)
 {
@@ -40,51 +40,71 @@ const char *get_home_dir(void)
 }
 
 /*
- *  mkdir_recursive
- *
- *  Create recursively directory using the FULL path.
+ * Create recursively directory using the FULL path.
  */
-int mkdir_recursive(const char *path, mode_t mode)
+int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
-    int ret;
-    char *p, tmp[PATH_MAX];
-    size_t len;
-    mode_t old_umask;
+	int ret;
+	char *p, tmp[PATH_MAX];
+	size_t len;
+	mode_t old_umask;
 
-    ret = snprintf(tmp, sizeof(tmp), "%s", 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;
-    }
+	len = ret;
+	if (tmp[len - 1] == '/') {
+		tmp[len - 1] = 0;
+	}
 
-    old_umask = umask(0);
-    for (p = tmp + 1; *p; p++) {
-        if (*p == '/') {
-            *p = 0;
-            ret = mkdir(tmp, mode);
-            if (ret < 0) {
-                if (!(errno == EEXIST)) {
+	old_umask = umask(0);
+	for (p = tmp + 1; *p; p++) {
+		if (*p == '/') {
+			*p = 0;
+			ret = mkdir(tmp, mode);
+			if (ret < 0) {
+				if (!(errno == EEXIST)) {
 					perror("mkdir recursive");
-					ret = errno;
-                    goto umask_error;
-                }
-            }
-            *p = '/';
-        }
-    }
+					ret = -errno;
+					goto umask_error;
+				}
+			} else if (ret == 0) {
+				/*
+				 * We created the directory. Set its ownership to the
+				 * user/group specified.
+				 */
+				ret = chown(tmp, uid, gid);
+				if (ret < 0) {
+					perror("chown in mkdir recursive");
+					ret = -errno;
+					goto umask_error;
+				}
+			}
+			*p = '/';
+		}
+	}
 
-    ret = mkdir(tmp, mode);
+	ret = mkdir(tmp, mode);
 	if (ret < 0) {
-		ret = errno;
+		ret = -errno;
+	} else if (ret == 0) {
+		/*
+		 * We created the directory. Set its ownership to the user/group
+		 * specified.
+		 */
+		ret = chown(tmp, uid, gid);
+		if (ret < 0) {
+			perror("chown in mkdir recursive");
+			ret = -errno;
+			goto umask_error;
+		}
 	}
 
 umask_error:
 	umask(old_umask);
 error:
-    return ret;
+	return ret;
 }