X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmkdir.c;h=b280618a977bbdbab9551459b9ff8c2e370382b7;hb=8a9c6071cb7467170010f0287672c987981bdf9c;hp=b7e5c6e67b7c81a934933c1e9c58a95b0b87a6c5;hpb=39bdfa31f2f00c3357e2a7a5f139abee6d7c7cd3;p=elogind.git
diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index b7e5c6e67..b280618a9 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -19,14 +19,9 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
#include
-#include
-#include
-#include "label.h"
#include "util.h"
#include "path-util.h"
#include "mkdir.h"
@@ -41,9 +36,11 @@ int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkd
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;
@@ -53,16 +50,7 @@ int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkd
}
int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid) {
- return mkdir_safe_internal(path, mode, uid, gid, false);
-}
-
-static int is_dir(const char* path) {
- struct stat st;
-
- if (stat(path, &st) < 0)
- return -errno;
-
- return S_ISDIR(st.st_mode);
+ 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) {
@@ -83,7 +71,7 @@ int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, mk
return 0;
p = strndupa(path, e - path);
- r = is_dir(p);
+ r = is_dir(p, true);
if (r > 0)
return 0;
if (r == 0)
@@ -128,7 +116,7 @@ int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, mkdir_fu
return r;
r = _mkdir(path, mode);
- if (r < 0 && (errno != EEXIST || is_dir(path) <= 0))
+ if (r < 0 && (errno != EEXIST || is_dir(path, true) <= 0))
return -errno;
return 0;
@@ -137,7 +125,3 @@ int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, mkdir_fu
int mkdir_p(const char *path, mode_t mode) {
return mkdir_p_internal(NULL, path, mode, mkdir);
}
-
-int mkdir_p_prefix(const char *prefix, const char *path, mode_t mode) {
- return mkdir_p_internal(prefix, path, mode, mkdir);
-}