Changeset 601 in kBuild for trunk/src/gmake/kmkbuiltin/mkdir.c

Timestamp:

Nov 26, 2006 12:19:19 AM (18 years ago)

Author:

bird

Message:

o Added rmdir as builtin and external command.
o Made mkdir not modify the argument strings.
o Made mkdir deal properly with DOS slashes on OS/2 and Windows.

File:

• trunk/src/gmake/kmkbuiltin/mkdir.c (modified) (2 diffs)

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -58 +58 @@
 #else
 #include "mscfakes.h"
+#include <malloc.h>
 #endif
 
@@ -161 +162 @@
         char *p;
 
+        const size_t len = strlen(path);
+        p = alloca(len + 1);
+        path = memcpy(p, path, len + 1);
+
+#if defined(_MSC_VER) || defined(__EMX__)
+        p = strchr(path, '\\');
+        while (p) {
+                *p++ = '/';
+                p = strchr(p, '\\');
+        }
+#endif 
+
         p = path;
         oumask = 0;
         retval = 0;
 #if defined(_MSC_VER) || defined(__EMX__)
-        if (    (    (p[0] >= 'A' && p[0] <= 'Z')
-                 ||  (p[0] >= 'a' && p[0] <= 'z'))
-            && p[1] == ':')
-            p += 2;
-        else if (   (p[0] == '/' || p[0] == '\\')
-                 && (p[1] == '/' || p[1] == '\\')
-                 && (p[2] != '/' && p[2] != '\\'))
-        {
-            char *p2;
-            p += 2;
-            p2 = strpbrk(p, "\\/");
-            if (p2)
-                p = p2 + 1;
-        }
+        if (    (    (p[0] >= 'A' && p[0] <= 'Z')
+                 ||  (p[0] >= 'a' && p[0] <= 'z'))
+            && p[1] == ':')
+                p += 2;
+        else if (   p[0] == '/'
+                 && p[1] == '/'
+                 && p[2] != '/')
+        {
+                char *p2;
+                p += 2;
+                p2 = strchr(p, '/');
+                if (p2)
+                        p = p2 + 1;
+        }
 #endif
         if (p[0] == '/')                /* Skip leading '/'. */