/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * 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
#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)
{
}
/*
- * 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, gid_t gid)
+int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
int ret;
char *p, tmp[PATH_MAX];
if (ret < 0) {
if (!(errno == EEXIST)) {
perror("mkdir recursive");
- ret = errno;
+ 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;
}
}
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: