[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    [BusyBox] mkdir (bb_make_directory) fail silently if the target
From:       Michael Tokarev <mjt () tls ! msk ! ru>
Date:       2004-09-27 18:14:27
Message-ID: 41585883.1050505 () tls ! msk ! ru
[Download RAW message or body]

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.

But I'm not sure whenever this is proper fix, because real mkdir,
without -p option, will fail with "EEXIST" error even if the
target is already existing directory, while busybox mkdir will
silently succed.  Probably another flag is needed, or re-use of
FILEUTILS_RECUR, in wich case the condition will look like:

             if (errno != EEXIST
                 || !(flags & FILEUTILS_RECUR)
                 || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) {

/mjt

["make_directory.patch" (text/plain)]

--- make_directory.c.orig	Mon Sep 27 22:07:44 2004
+++ make_directory.c	Mon Sep 27 22:09:32 2004
@@ -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 @@
 	const char *fail_msg;
 	char *s = path;
 	char c;
+	struct stat st;
 
 	mask = umask(0);
 	umask(mask & ~0300);
@@ -70,7 +72,8 @@
 		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
+				|| (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) {
 				fail_msg = "create";
 				umask(mask);
 				break;


_______________________________________________
busybox mailing list
busybox@mail.busybox.net
http://codepoet.org/mailman/listinfo/busybox


[prev in list] [next in list] [prev in thread] [next in thread]