Changeset 936 in kBuild for trunk/src

Timestamp:

May 26, 2007 6:42:30 PM (18 years ago)

Author:

bird

Message:

wrap rmdir as well (the stupid trailing slash problem).

Location:

trunk/src/gmakenew/kmkbuiltin

Files:

• mscfakes.c (modified) (3 diffs)
• mscfakes.h (modified) (1 diff)

trunk/src/gmakenew/kmkbuiltin/mscfakes.c

@@ -33 +33 @@
 #include "err.h"
 #include "mscfakes.h"
-#undef mkdir
 
 
@@ -53 +52 @@
 int mkdir_msc(const char *path, mode_t mode)
 {
-    int rc = mkdir(path);
+    int rc = (mkdir)(path);
     if (rc)
     {
@@ -62 +61 @@
             while (len > 0 && (str[len - 1] == '/' || str[len - 1] == '\\'))
                 str[--len] = '\0';
-            rc = mkdir(str);
+            rc = (mkdir)(str);
+            free(str);
+        }
+    }
+    return rc;
+}
+
+int rmdir_msc(const char *path)
+{
+    int rc = (rmdir)(path);
+    if (rc)
+    {
+        int len = strlen(path);
+        if (len > 0 && (path[len - 1] == '/' || path[len - 1] == '\\'))
+        {
+            char *str = strdup(path);
+            while (len > 0 && (str[len - 1] == '/' || str[len - 1] == '\\'))
+                str[--len] = '\0';
+            rc = (rmdir)(str);
             free(str);
         }

trunk/src/gmakenew/kmkbuiltin/mscfakes.h

@@ -122 +122 @@
 #define readlink(link, buf, size) -1
 #define reallocf(old, size) realloc(old, size)
+int rmdir_msc(const char *path);
+#define rmdir(path) rmdir_msc(path)
 intmax_t strtoimax(const char *nptr, char **endptr, int base);
 uintmax_t strtoumax(const char *nptr, char **endptr, int base);