2842659cc
Eric Andersen
2004-10-08
Subject
Patch from Michael Tokarev:
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/make_directory.c+5 -1
| @@ -37,6 +37,7 @@ | |
| #include <errno.h> | |
| #include <unistd.h> | |
| + | #include <sys/stat.h> |
| #include "libbb.h" | |
| int bb_make_directory (char *path, long mode, int flags) | |
| @@ -45,6 +46,7 @@ int bb_make_directory (char *path, long mode, int flags) | |
| const char *fail_msg; | |
| char *s = path; | |
| char c; | |
| + | struct stat st; |
| mask = umask(0); | |
| umask(mask & ~0300); | |
| @@ -70,7 +72,9 @@ int bb_make_directory (char *path, long mode, int flags) | |
| if (mkdir(path, 0777) < 0) { | |
| /* If we failed for any other reason than the directory | |
| * already exists, output a diagnostic and return -1.*/ | |
| - | if (errno != EEXIST) { |
| + | if (errno != EEXIST |
| + | || !(flags & FILEUTILS_RECUR) |
| + | || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { |
| fail_msg = "create"; | |
| umask(mask); | |
| break; | |