chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing.h: add NDA_*
[elogind.git]
/
src
/
shared
/
mkdir.c
diff --git
a/src/shared/mkdir.c
b/src/shared/mkdir.c
index fef674c1b39eaf78a5336dad8f3f824c59d7911e..b280618a977bbdbab9551459b9ff8c2e370382b7 100644
(file)
--- a/
src/shared/mkdir.c
+++ b/
src/shared/mkdir.c
@@
-19,31
+19,28
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <string.h>
#include <string.h>
-#include <unistd.h>
#include <errno.h>
#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "mkdir.h"
-#include "label.h"
#include "util.h"
#include "util.h"
-#include "log.h"
+#include "path-util.h"
+#include "mkdir.h"
-int
safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid
) {
+int
mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir
) {
struct stat st;
struct stat st;
- if (
label
_mkdir(path, mode) >= 0)
+ if (_mkdir(path, mode) >= 0)
if (chmod_and_chown(path, mode, uid, gid) < 0)
return -errno;
if (lstat(path, &st) < 0)
return -errno;
if (chmod_and_chown(path, mode, uid, gid) < 0)
return -errno;
if (lstat(path, &st) < 0)
return -errno;
- if ((st.st_mode & 0777) != mode ||
- st.st_uid != uid ||
- st.st_gid != gid ||
+ if ((st.st_mode & 0007) > (mode & 0007) ||
+ (st.st_mode & 0070) > (mode & 0070) ||
+ (st.st_mode & 0700) > (mode & 0700) ||
+ (uid != UID_INVALID && st.st_uid != uid) ||
+ (gid != GID_INVALID && st.st_gid != gid) ||
!S_ISDIR(st.st_mode)) {
errno = EEXIST;
return -errno;
!S_ISDIR(st.st_mode)) {
errno = EEXIST;
return -errno;
@@
-52,29
+49,38
@@
int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
return 0;
}
return 0;
}
-int mkdir_parents(const char *path, mode_t mode) {
- struct stat st;
+int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid) {
+ return mkdir_safe_internal(path, mode, uid, gid, mkdir);
+}
+
+int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, mkdir_func_t _mkdir) {
const char *p, *e;
const char *p, *e;
+ int r;
assert(path);
assert(path);
+ if (prefix && !path_startswith(path, prefix))
+ return -ENOTDIR;
+
/* return immediately if directory exists */
e = strrchr(path, '/');
if (!e)
return -EINVAL;
/* return immediately if directory exists */
e = strrchr(path, '/');
if (!e)
return -EINVAL;
+
+ if (e == path)
+ return 0;
+
p = strndupa(path, e - path);
p = strndupa(path, e - path);
- if (stat(p, &st) >= 0) {
- if ((st.st_mode & S_IFMT) == S_IFDIR)
- return 0;
- else
- return -ENOTDIR;
- }
+ r = is_dir(p, true);
+ if (r > 0)
+ return 0;
+ if (r == 0)
+ return -ENOTDIR;
/* create every parent directory in the path, except the last component */
p = path + strspn(path, "/");
for (;;) {
/* create every parent directory in the path, except the last component */
p = path + strspn(path, "/");
for (;;) {
- int r;
- char *t;
+ char t[strlen(path) + 1];
e = p + strcspn(p, "/");
p = e + strspn(e, "/");
e = p + strcspn(p, "/");
p = e + strspn(e, "/");
@@
-84,26
+90,38
@@
int mkdir_parents(const char *path, mode_t mode) {
if (*p == 0)
return 0;
if (*p == 0)
return 0;
- if (!(t = strndupa(path, e - path)))
-
return -ENOMEM
;
+ memcpy(t, path, e - path);
+
t[e-path] = 0
;
- r = label_mkdir(t, mode);
+ if (prefix && path_startswith(prefix, t))
+ continue;
+ r = _mkdir(t, mode);
if (r < 0 && errno != EEXIST)
return -errno;
}
}
if (r < 0 && errno != EEXIST)
return -errno;
}
}
-int mkdir_p(const char *path, mode_t mode) {
+int mkdir_parents(const char *path, mode_t mode) {
+ return mkdir_parents_internal(NULL, path, mode, mkdir);
+}
+
+int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, mkdir_func_t _mkdir) {
int r;
/* Like mkdir -p */
int r;
/* Like mkdir -p */
- if ((r = mkdir_parents(path, mode)) < 0)
+ r = mkdir_parents_internal(prefix, path, mode, _mkdir);
+ if (r < 0)
return r;
return r;
- if (label_mkdir(path, mode) < 0 && errno != EEXIST)
+ r = _mkdir(path, mode);
+ if (r < 0 && (errno != EEXIST || is_dir(path, true) <= 0))
return -errno;
return 0;
}
return -errno;
return 0;
}
+
+int mkdir_p(const char *path, mode_t mode) {
+ return mkdir_p_internal(NULL, path, mode, mkdir);
+}