Changeset 3917

Timestamp:

Oct 24, 2014, 10:02:16 PM (10 years ago)

Author:

bird

Message:

0.6: 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:

branches/libc-0.6/src/emx/src/lib/sys

Files:

• fs.c (modified) (2 diffs)
• pathrewrite.c (modified) (2 diffs)

branches/libc-0.6/src/emx/src/lib/sys/fs.c ¶

@@ -323 +323 @@
                 && ((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')
                 )
             {
@@ -339 +339 @@
                     __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. */

branches/libc-0.6/src/emx/src/lib/sys/pathrewrite.c ¶

@@ -660 +660 @@
         while ((ch = *pszEnd) && ch != '/' && ch != '\\')
             pszEnd++;
-        cch    = pszEnd - psz;
+        cch = (unsigned)(pszEnd - psz);
         if (cch > 255)
         {
@@ -707 +707 @@
                 continue;
             }
-            else
-            {
-                /*
-                 * Complete match. We're done!
-                 */
-                if (    pEntry->fType == DIRENTRY_TYPE_FILE
-                    ||  pEntry->u.pDir->pRule /* DIRENTRY_TYPE_DIR */)
+
+            /*
+             * Complete match. We're done!
+             */
+            if (    pEntry->fType == DIRENTRY_TYPE_FILE
+                ||  pEntry->u.pDir->pRule /* DIRENTRY_TYPE_DIR */)
+            {
+                __LIBC_PPATHREWRITE pRule = pEntry->fType == DIRENTRY_TYPE_FILE
+                                          ? pEntry->u.pFile : pEntry->u.pDir->pRule;
+                cch = pRule->cchTo + 1;
+                if (pszBuf)
                 {
-                    __LIBC_PPATHREWRITE pRule = pEntry->fType == DIRENTRY_TYPE_FILE
-                        ? pEntry->u.pFile : pEntry->u.pDir->pRule;
-                    cch = pRule->cchTo + 1;
-                    if (pszBuf)
-                    {
-                        if (cchBuf < cch)
-                            LIBCLOG_ERROR_RETURN(-1, "ret -1 - Buffer is too small (%d < %d)\n", cchBuf, cch);
-                        memcpy(pszBuf, pRule->pszTo, cch);
-                        LIBCLOG_MSG("rewritten: '%s' (complete)\n", pszBuf);
-                    }
-                    LIBCLOG_RETURN_INT(cch);
+                    if (cchBuf < cch)
+                        LIBCLOG_ERROR_RETURN(-1, "ret -1 - Buffer is too small (%d < %d)\n", cchBuf, cch);
+                    memcpy(pszBuf, pRule->pszTo, cch);
+                    LIBCLOG_MSG("rewritten: '%s' (complete)\n", pszBuf);
                 }
-                /* not a match, the directory wasn't rewritten, quit searching. */
-            }
+                LIBCLOG_RETURN_INT(cch);
+            }
+            /* not a match, the directory wasn't rewritten, quit searching. */
         }
         /* no match, we're done. */