Merge branch 'busybox' into merge

1 files changed, 13 insertions, 2 deletions

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 3980376ec..840c525b0 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -35,9 +35,20 @@ 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;