1 files changed, 33 insertions, 0 deletions

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index a6b7c28df..3e171ff02 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -51,11 +51,44 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
         }
 
         org_mask = cur_mask = (mode_t)-1L;
+#if ENABLE_PLATFORM_MINGW32
+        /* normalise path separators, path is already assumed writable */
+        for (s=path; *s; ++s) {
+                if (*s == '\\') {
+                        *s = '/';
+                }
+        }
+#endif
         s = path;
         while (1) {
                 c = '\0';
 
                 if (flags & FILEUTILS_RECUR) {  /* Get the parent */
+#if ENABLE_PLATFORM_MINGW32
+                        if (s == path && *s && s[1] == ':') {
+                                /* skip drive letter */
+                                s += 2;
+                        }
+                        else if (s == path && s[0] == '/' && s[1] == '/' ) {
+                                /* skip UNC server and share */
+                                int count = 0;
+                                s += 2;
+                                while (*s) {
+                                        if (*s == '/') {
+                                                do {
+                                                        ++s;
+                                                } while (*s == '/');
+                                                if (++count == 2) {
+                                                        --s;
+                                                        break;
+                                                }
+                                        }
+                                        else {
+                                                ++s;
+                                        }
+                                }
+                        }
+#endif
                         /* Bypass leading non-'/'s and then subsequent '/'s */
                         while (*s) {
                                 if (*s == '/') {