chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: simplify how instantiated units are mapped to cgroups
[elogind.git]
/
src
/
shared
/
mkdir.c
diff --git
a/src/shared/mkdir.c
b/src/shared/mkdir.c
index 0e51b64f69331d21228b2dcc1621fb29df18f274..e21a0f398949fd90d614c07a2f0e600a0ebb2cf3 100644
(file)
--- a/
src/shared/mkdir.c
+++ b/
src/shared/mkdir.c
@@
-26,15
+26,16
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
-#include "mkdir.h"
#include "label.h"
#include "util.h"
#include "label.h"
#include "util.h"
+#include "path-util.h"
+#include "mkdir.h"
int mkdir_label(const char *path, mode_t mode) {
return label_mkdir(path, mode, true);
}
int mkdir_label(const char *path, mode_t mode) {
return label_mkdir(path, mode, true);
}
-static int m
akedir_safe
(const char *path, mode_t mode, uid_t uid, gid_t gid, bool apply) {
+static int m
kdir_safe_internal
(const char *path, mode_t mode, uid_t uid, gid_t gid, bool apply) {
struct stat st;
if (label_mkdir(path, mode, apply) >= 0)
struct stat st;
if (label_mkdir(path, mode, apply) >= 0)
@@
-56,36
+57,50
@@
static int makedir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid, boo
}
int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid) {
}
int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid) {
- return m
akedir_safe
(path, mode, uid, gid, false);
+ return m
kdir_safe_internal
(path, mode, uid, gid, false);
}
int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
}
int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
- return m
akedir_safe
(path, mode, uid, gid, true);
+ return m
kdir_safe_internal
(path, mode, uid, gid, true);
}
}
-static int
makedir_parents(const char *path, mode_t mode, bool apply
) {
+static int
is_dir(const char* path
) {
struct stat st;
struct stat st;
+
+ if (stat(path, &st) < 0)
+ return -errno;
+
+ return S_ISDIR(st.st_mode);
+}
+
+static int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, bool apply) {
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);
+ 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, "/");
@@
-95,39
+110,36
@@
static int makedir_parents(const char *path, mode_t mode, bool apply) {
if (*p == 0)
return 0;
if (*p == 0)
return 0;
- t = strndup(path, e - path);
- if (!t)
- return -ENOMEM;
+ memcpy(t, path, e - path);
+ t[e-path] = 0;
- r = label_mkdir(t, mode, apply);
-
free(t)
;
+ if (prefix && path_startswith(prefix, t))
+
continue
;
+ r = label_mkdir(t, mode, apply);
if (r < 0 && errno != EEXIST)
return -errno;
}
}
int mkdir_parents(const char *path, mode_t mode) {
if (r < 0 && errno != EEXIST)
return -errno;
}
}
int mkdir_parents(const char *path, mode_t mode) {
- return m
akedir_parents(
path, mode, false);
+ return m
kdir_parents_internal(NULL,
path, mode, false);
}
int mkdir_parents_label(const char *path, mode_t mode) {
}
int mkdir_parents_label(const char *path, mode_t mode) {
- return m
akedir_parents(
path, mode, true);
+ return m
kdir_parents_internal(NULL,
path, mode, true);
}
}
-static int is_dir(const char* path) {
- struct stat st;
- if (stat(path, &st) < 0)
- return -errno;
- return S_ISDIR(st.st_mode);
+int mkdir_parents_prefix(const char *prefix, const char *path, mode_t mode) {
+ return mkdir_parents_internal(prefix, path, mode, true);
}
}
-static int m
akedir_p(
const char *path, mode_t mode, bool apply) {
+static int m
kdir_p_internal(const char *prefix,
const char *path, mode_t mode, bool apply) {
int r;
/* Like mkdir -p */
int r;
/* Like mkdir -p */
- r = m
akedir_parents(
path, mode, apply);
+ r = m
kdir_parents_internal(prefix,
path, mode, apply);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-139,9
+151,13
@@
static int makedir_p(const char *path, mode_t mode, bool apply) {
}
int mkdir_p(const char *path, mode_t mode) {
}
int mkdir_p(const char *path, mode_t mode) {
- return m
akedir_p(
path, mode, false);
+ return m
kdir_p_internal(NULL,
path, mode, false);
}
int mkdir_p_label(const char *path, mode_t mode) {
}
int mkdir_p_label(const char *path, mode_t mode) {
- return makedir_p(path, mode, true);
+ return mkdir_p_internal(NULL, path, mode, true);
+}
+
+int mkdir_p_prefix(const char *prefix, const char *path, mode_t mode) {
+ return mkdir_p_internal(prefix, path, mode, false);
}
}