Changeset 1952 for trunk/src

Timestamp:

May 2, 2005, 5:55:14 AM (20 years ago)

Author:

bird

Message:

Unix root rewrite rule ends it's pszTo with a slash, this caused two slashes and thus UNC trouble.

File:

• trunk/src/emx/src/lib/sys/pathrewrite.c (modified) (2 diffs, 1 prop)

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

@@ -962 +962 @@
         if (pszBuf)
         {
+            char *pszBufIn = pszBuf;
             if (cchBuf < cchTotal)
             {
@@ -968 +969 @@
             }
             memcpy(pszBuf, pRuleBest->pszTo, pRuleBest->cchTo);
-            pszBuf[pRuleBest->cchTo] = '\\';
-            memcpy(pszBuf + pRuleBest->cchTo + 1, pszBest, cch + 1);
-            LIBCLOG_MSG("rewritten: '%s' (partial)\n", pszBuf);
+            pszBuf += pRuleBest->cchTo;
+            if (    pszBuf[-1] != '/'
+                &&  pszBuf[-1] != '\\')
+                *pszBuf++ = '\\';
+            memcpy(pszBuf, pszBest, cch + 1);
+            LIBCLOG_MSG("rewritten: '%s' (partial)\n", pszBufIn); (void)pszBufIn;
         }
         LIBCLOG_RETURN_INT(cchTotal);