summaryrefslogtreecommitdiff
path: root/libbb/make_directory.c
diff options
context:
space:
mode:
authorEric Andersen2004-10-08 07:21:58 +0000
committerEric Andersen2004-10-08 07:21:58 +0000
commit2842659cc02233274ca165ffb83a31b161d815cd (patch)
tree7f9d0ea0e20dcc8bc53fcc0035a3e955820c5ded /libbb/make_directory.c
parentd952ee2e9ed15fc19c58938ab6005e95e6a595dc (diff)
downloadbusybox-2842659cc02233274ca165ffb83a31b161d815cd.zip
busybox-2842659cc02233274ca165ffb83a31b161d815cd.tar.gz
Patch from Michael Tokarev:
Scenario: touch x -- creates plain file name `x' mkdir x -- exits successefully libbb/make_directory.c, bb_make_directory(), contains the following code: 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) { fail_msg = "create"; umask(mask); break; } /* Since the directory exists, don't attempt to change * permissions if it was the full target. Note that * this is not an error conditon. */ if (!c) { umask(mask); return 0; } } The assumption that EEXIST error is due to that the *directory* already exists is wrong: any file type with that name will cause this error to be returned. Proper way IMHO will be is to stat() the path and check whenever this is really a directory. Below (attached) is a patch to fix this issue.
Diffstat (limited to 'libbb/make_directory.c')
-rw-r--r--libbb/make_directory.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 710537d..d07ccb9 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -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;