Changeset 727 in kBuild for trunk/src/lib/kDep.c

Timestamp:

Dec 17, 2006 1:43:01 AM (18 years ago)

Author:

bird

Message:

Extended the windows fixcase function to also take care of path components with spaces in them. Also, don't stop fixing the path if we were given a shortname.

File:

• trunk/src/lib/kDep.c (modified) (5 diffs)

trunk/src/lib/kDep.c

@@ -84 +84 @@
 #ifdef __WIN32__
 /**
- * Corrects the case of a path.
- * Expects a fullpath!
+ * Corrects the case of a path and changes any path components containing 
+ * spaces with the short name (which can be longer).
+ * 
+ * Expects a _fullpath!
  *
  * @param   pszPath     Pointer to the path, both input and output.
- *                      The buffer must be able to hold one more byte than the string length.
+ *                      The buffer must be at least MAX_PATH in length.
  */
 static void fixcase(char *pszPath)
@@ -158 +160 @@
         char chSaved1;
         char *pszEnd;
+        int cch;
+        int iLongNameDiff;
 
 
@@ -164 +168 @@
         while (*pszEnd && *pszEnd != '/' && *pszEnd != '\\')
             pszEnd++;
+        cch = pszEnd - psz;
 
         /* replace the end with "?\0" */
@@ -180 +185 @@
         }
         pszEnd[0] = '\0';
-        while (stricmp(FindFileData.cFileName, psz))
+        while (   (iLongNameDiff = stricmp(FindFileData.cFileName, psz))
+               && stricmp(FindFileData.cAlternateFileName, psz))
         {
             if (!FindNextFile(hDir, &FindFileData))
@@ -188 +194 @@
             }
         }
-        strcpy(psz, FindFileData.cFileName);
         pszEnd[0] = chSaved0;
+        if (iLongNameDiff || !FindFileData.cAlternateFileName[0] || !memchr(psz, ' ', cch))
+            memcpy(psz, !iLongNameDiff ? FindFileData.cFileName : FindFileData.cAlternateFileName, cch);
+        else
+        {
+            /* replace spacy name with the short name. */
+            const int cchAlt = strlen(FindFileData.cAlternateFileName);
+            const int cchDelta = cch - cchAlt;
+            my_assert(cchAlt > 0);
+            if (!cchDelta)
+                memcpy(psz, FindFileData.cAlternateFileName, cch);
+            else
+            {
+                memmove(psz + cchAlt, pszEnd, strlen(pszEnd) + 1);
+                pszEnd -= cchDelta;
+                memcpy(psz, FindFileData.cAlternateFileName, cchAlt);
+            }
+        }
+        my_assert(pszEnd[0] == chSaved0);
 
         /* advance to the next component */