picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared: fail mkdir_p if the target exists and is not a directory 

This makes mkdir_p actually behave like mkdir -p.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-10-02 14:42:10 +02:00
parent 27407a01c6
commit 5b585b5380
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/mkdir.c
View File

@ -115,6 +115,13 @@ int mkdir_parents_label(const char *path, mode_t mode) {
return makedir_parents(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);
}
static int makedir_p(const char *path, mode_t mode, bool apply) {
int r;
@ -124,7 +131,8 @@ static int makedir_p(const char *path, mode_t mode, bool apply) {
if (r < 0)
return r;
if (label_mkdir(path, mode, apply) < 0 && errno != EEXIST)
r = label_mkdir(path, mode, apply);
if (r < 0 && (errno != EEXIST || is_dir(path) <= 0))
return -errno;
return 0;