Changeset 728 in kBuild for trunk/src/gmake

Timestamp:

Dec 17, 2006 1:44:37 AM (18 years ago)

Author:

bird

Message:

don't stop fixing the path case if one component happens to be a short name.

File:

• trunk/src/gmake/w32/pathstuff.c (modified) (3 diffs)

trunk/src/gmake/w32/pathstuff.c

@@ -201 +201 @@
         char chSaved1;
         char *pszEnd;
+        int iLongNameDiff;
 
 
@@ -225 +226 @@
         }
         pszEnd[0] = '\0';
-        while (stricmp(FindFileData.cFileName, psz))
+        while (   (iLongNameDiff = stricmp(FindFileData.cFileName, psz))
+               && stricmp(FindFileData.cAlternateFileName, psz))
         {
             if (!FindNextFile(hDir, &FindFileData))
@@ -235 +237 @@
             }
         }
-        strcpy(psz, FindFileData.cFileName);
+        strcpy(psz, !iLongNameDiff ? FindFileData.cFileName : FindFileData.cAlternateFileName);
         pszEnd[0] = chSaved0;
         FindClose(hDir);