Changeset 1368 in kBuild for trunk/src/lib/nt_fullpath.c

Timestamp:

Dec 7, 2007 7:36:06 PM (17 years ago)

Author:

bird

Message:

don't be optimistic in the cache lookup code, the next component might not exist and we might end up screwing the casing of it this way.

File:

• trunk/src/lib/nt_fullpath.c (modified) (3 diffs)

trunk/src/lib/nt_fullpath.c

@@ -113 +113 @@
         char *pszLast = &s_szLast[psz - pszPath];
         char *pszCur = psz;
+        char *pszSrc0 = pszLast;
+        char *pszDst0 = pszCur;
         for (;;)
         {
@@ -119 +121 @@
             if (    ch1 != ch2
                 &&  (ch1 != '\\' || ch2 != '/')
-                &&  (ch1 != '/'  || ch2 != '\\'))
-            {
-                if (    tolower(ch1) != tolower(ch2)
-                    &&  toupper(ch1) != toupper(ch2))
-                    break;
-                /* optimistic, component mismatch will be corrected in the next loop. */
-                *pszCur = ch2;
-            }
+                &&  (ch1 != '/'  || ch2 != '\\')
+                &&  tolower(ch1) != tolower(ch2)
+                &&  toupper(ch1) != toupper(ch2))
+                break;
             if (ch1 == '/' || ch1 == '\\')
-                psz = pszCur + 1;
+            {
+                                psz = pszCur + 1;
+                *pszLast = ch1; /* preserve the slashes */
+            }
             else if (ch1 == '\0')
             {
@@ -137 +138 @@
             pszLast++;
         }
+        if (psz != pszDst0)
+            memcpy(pszDst0, pszSrc0, psz - pszDst0);
     }