Changeset 3918

Timestamp:

Oct 24, 2014, 10:08:32 PM (11 years ago)

Author:

bird

Message:

trunk: fs.c,pathrewrite.c: Do a better job with trailing slashes on UNIXROOT env var, allow just a drive letter too. Straightened out a couple of style/doc issues in pathrewrite.c.

Location:

trunk/libc/src/kNIX/os2

Files:

• fs-os2.c (modified) (2 diffs)
• pathrewrite.c (modified) (3 diffs)

trunk/libc/src/kNIX/os2/fs-os2.c

@@ -271 +271 @@
             && ((psz[0] >= 'A' && psz[0] <= 'Z') || (psz[0] >= 'a' && psz[0] <= 'z'))
             && psz[1] == ':'
-            && (psz[2] == '\\' || psz[2] == '/')
+            && (psz[2] == '\\' || psz[2] == '/' || psz[2] == '\0')
             )
         {
@@ -287 +287 @@
                 __libc_gszUnixRoot[0] -= 'a' - 'A';
 
-            size_t off = cch;
-            while (off-- > 0)
-                if (__libc_gszUnixRoot[off] == '\\')
-                    __libc_gszUnixRoot[off] = '/';
+            if (cch == 2)
+            {
+                __libc_gszUnixRoot[cch++] = '/';
+                __libc_gszUnixRoot[cch] = '\0';
+            }
+            else
+            {
+                size_t off = cch;
+                while (off-- > 0)
+                    if (__libc_gszUnixRoot[off] == '\\')
+                        __libc_gszUnixRoot[off] = '/';
+
+                while (cch > 3 && __libc_gszUnixRoot[cch - 1] == '/')
+                    __libc_gszUnixRoot[--cch] = '\0';
+            }
 
             /* Register the rewrite rule. */

trunk/libc/src/kNIX/os2/pathrewrite.c

@@ -650 +650 @@
         while ((ch = *pszEnd) && ch != '/' && ch != '\\')
             pszEnd++;
-        cch    = pszEnd - psz;
+        cch    = (unsigned)(pszEnd - psz);
         if (cch > 255)
         {
@@ -697 +697 @@
                 continue;
             }
-            else
-            {
-                /*
+
+            /*
                  * Complete match. We're done!
                  */
@@ -718 +717 @@
                 }
                 /* not a match, the directory wasn't rewritten, quit searching. */
-            }
         }
         /* no match, we're done. */