Start 1.33.0 development cycle

[oweals/busybox.git] / libbb / make_directory.c

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 4486eb1edf9476014980592080619806327af8b6..9b03bb8d0f461945c37fd378725ca0e4ed39612c 100644 (file)
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -4,9 +4,8 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /* Mar 5, 2003    Manuel Novoa III
  *
  * This is the main work function for the 'mkdir' applet.  As such, it
@@ -21,7 +20,6 @@
  * To set specific permissions on 'path', pass the appropriate 'mode'
  * val.  Otherwise, pass -1 to get default permissions.
  */
-
 #include "libbb.h"
 
 /* This function is used from NOFORK applets. It must not allocate anything */
@@ -35,16 +33,27 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
        char c;
        struct stat st;
 
-       /* Happens on bb_make_directory(dirname("no_slashes"),...) */
-       if (LONE_CHAR(path, '.'))
+       /* "path" can be a result of dirname().
+        * dirname("no_slashes") returns ".", possibly read-only.
+        * musl dirname() can return read-only "/" too.
+        * We need writable string. And for "/", "." (and ".."?)
+        * nothing needs to be created anyway.
+        */
+       if (LONE_CHAR(path, '/'))
                return 0;
+       if (path[0] == '.') {
+               if (path[1] == '\0')
+                       return 0; /* "." */
+//             if (path[1] == '.' && path[2] == '\0')
+//                     return 0; /* ".." */
+       }
 
        org_mask = cur_mask = (mode_t)-1L;
        s = path;
        while (1) {
                c = '\0';
 
-               if (flags & FILEUTILS_RECUR) {  /* Get the parent */
+               if (flags & FILEUTILS_RECUR) {  /* Get the parent */
                        /* Bypass leading non-'/'s and then subsequent '/'s */
                        while (*s) {
                                if (*s == '/') {
@@ -83,10 +92,11 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                        }
                }
 
+               //bb_error_msg("mkdir '%s'", path);
                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 && errno != EISDIR)
                         || !(flags & FILEUTILS_RECUR)
                         || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode))
                        ) {
@@ -99,15 +109,26 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                        if (!c) {
                                goto ret0;
                        }
+               } else {
+                       if (flags & FILEUTILS_VERBOSE) {
+                               printf("created directory: '%s'\n", path);
+                       }
                }
 
                if (!c) {
                        /* Done.  If necessary, update perms on the newly
                         * created directory.  Failure to update here _is_
                         * an error. */
-                       if ((mode != -1) && (chmod(path, mode) < 0)) {
-                               fail_msg = "set permissions of";
-                               break;
+                       if (mode != -1) {
+                               //bb_error_msg("chmod 0%03lo mkdir '%s'", mode, path);
+                               if (chmod(path, mode) < 0) {
+                                       fail_msg = "set permissions of";
+                                       if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+                                               flags = 0;
+                                               goto print_err;
+                                       }
+                                       break;
+                               }
                        }
                        goto ret0;
                }
@@ -116,8 +137,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                *s = c;
        } /* while (1) */
 
-       bb_perror_msg("can't %s directory '%s'", fail_msg, path);
        flags = -1;
+ print_err:
+       bb_perror_msg("can't %s directory '%s'", fail_msg, path);
        goto ret;
  ret0:
        flags = 0;