Changeset 1328

Timestamp:

Mar 22, 2004, 8:38:43 PM (21 years ago)

Author:

bird

Message:

Ignore one trailing slash.

Location:

trunk/src/emx/src/lib/sys

Files:

• __mkdir.c (modified) (3 diffs, 1 prop)
• __rmdir.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/sys/__mkdir.c

@@ -6 +6 @@
 #include <os2emx.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <emx/syscalls.h>
@@ -19 +20 @@
     ULONG   rc;
     int     cch;
+    char    ch;
     FS_VAR();
 
@@ -45 +47 @@
 
     /*
+     * Strip off any trailing slashes.
+     * (Linux and FreeBSD accept this.)
+     */
+    if (cch <= 0)
+    {
+        cch = strlen(pszPath);
+        if (    cch > 2
+            && ((ch = pszPath[cch - 1]) == '/' || ch == '\\')
+            && pszPath[cch - 2] != ':')
+        {
+            char *psz = alloca(cch);
+            if (!psz)
+            {
+                errno = ENOMEM;
+                LIBCLOG_RETURN_INT(-1);
+            }
+            pszPath = (const char *)memcpy(psz, pszPath, cch);
+            psz[cch - 1] = '\0';
+        }
+    }
+    else if (    cch > 3                /* includes terminator */
+             && ((ch = pszPath[cch - 2]) == '/' || ch == '\\')
+             && pszPath[cch - 3] != ':')
+        ((char *)pszPath)[cch - 2] = '\0';          /* rewrite temp buffer. */
+
+
+
+    /*
      * Do It.
      */

trunk/src/emx/src/lib/sys/__rmdir.c

@@ -5 +5 @@
 #include <os2emx.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <emx/syscalls.h>
@@ -17 +18 @@
     ULONG   rc;
     int     cch;
+    char    ch;
     FS_VAR();
 
@@ -43 +45 @@
 
     /*
+     * Strip off any trailing slashes.
+     * (Linux and FreeBSD accept this.)
+     */
+    if (cch <= 0)
+    {
+        cch = strlen(pszPath);
+        if (    cch > 2
+            && ((ch = pszPath[cch - 1]) == '/' || ch == '\\')
+            && pszPath[cch - 2] != ':')
+        {
+            char *psz = alloca(cch);
+            if (!psz)
+            {
+                errno = ENOMEM;
+                LIBCLOG_RETURN_INT(-1);
+            }
+            pszPath = (const char *)memcpy(psz, pszPath, cch);
+            psz[cch - 1] = '\0';
+        }
+    }
+    else if (    cch > 3                /* includes terminator */
+             && ((ch = pszPath[cch - 2]) == '/' || ch == '\\')
+             && pszPath[cch - 3] != ':')
+        ((char *)pszPath)[cch - 2] = '\0';          /* rewrite temp buffer. */
+
+    /*
      * Do It.
      */