Changeset 304 for trunk/src

Timestamp:

Aug 11, 2005, 10:17:17 PM (20 years ago)

Author:

bird

Message:

Fixed casing paths on win32.

Location:

trunk/src

Files:

• gmake/w32/pathstuff.c (modified) (3 diffs)
• kDepPre/Makefile.kmk (modified) (1 diff)
• kDepPre/kDepPre.c (modified) (4 diffs)

trunk/src/gmake/w32/pathstuff.c

@@ +1 @@
+#include <windows.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "make.h"
 #include "pathstuff.h"
+
 
 /*
@@ -64 +67 @@
 
 /*
+ * Corrects the case of a path.
+ * Expects a fullpath!
+ */
+void w32_fixcase(char *pszPath)
+{
+#define my_assert(expr) \
+    do { \
+        if (!(expr)) { \
+            printf("my_assert: %s, file %s, line %d\npszPath=%s\npsz=%s\n", \
+                   #expr, __FILE__, __LINE__, pszPath, psz); \
+            __asm { __asm int 3 } \
+            exit(1); \
+        } \
+    } while (0)
+    
+    char *psz = pszPath;
+    if (*psz == '/' || *psz == '\\')
+    {
+        if (psz[1] == '/' || psz[1] == '\\')
+        {
+            /* UNC */
+            my_assert(psz[1] == '/' || psz[1] == '\\');
+            my_assert(psz[2] != '/' && psz[2] != '\\');
+
+            /* skip server name */
+            psz += 2;
+            while (*psz != '\\' && *psz != '/')
+            {
+                if (!*psz)
+                    return;
+                *psz++ = toupper(*psz);
+            }
+
+            /* skip the share name */
+            psz++;
+            my_assert(*psz != '/' && *psz != '\\');
+            while (*psz != '\\' && *psz != '/')
+            {
+                if (!*psz)
+                    return;
+                *psz++ = toupper(*psz);
+            }
+            my_assert(*psz == '/' || *psz == '\\');
+            psz++;
+        }
+        else
+        {
+            /* Unix spec */
+            psz++;
+        }
+    }
+    else
+    {
+        /* Drive letter */
+        my_assert(psz[1] == ':');
+        *psz = toupper(*psz);
+        my_assert(psz[0] >= 'A' && psz[0] <= 'Z');
+        my_assert(psz[2] == '/' || psz[2] == '\\');
+        psz += 3;
+    }
+
+    /*
+     * Pointing to the first char after the unc or drive specifier.
+     */
+    while (*psz)
+    {
+        WIN32_FIND_DATA FindFileData;
+        HANDLE hDir;
+        char chSaved0;
+        char chSaved1;
+        char *pszEnd;
+
+
+        /* find the end of the component. */
+        pszEnd = psz;
+        while (*pszEnd && *pszEnd != '/' && *pszEnd != '\\')
+            pszEnd++;
+
+        /* replace the end with "?\0" */
+        chSaved0 = pszEnd[0];
+        chSaved1 = pszEnd[1];
+        pszEnd[0] = '?';
+        pszEnd[1] = '\0';
+
+        /* find the right filename. */
+        hDir = FindFirstFile(pszPath, &FindFileData);
+        pszEnd[1] = chSaved1;
+        if (!hDir)
+        {
+            pszEnd[0] = chSaved0;
+            return;
+        }
+        pszEnd[0] = '\0';
+        while (stricmp(FindFileData.cFileName, psz))
+        {
+            if (!FindNextFile(hDir, &FindFileData))
+            {
+                pszEnd[0] = chSaved0;
+                return;
+            }
+        }
+        strcpy(psz, FindFileData.cFileName);
+        pszEnd[0] = chSaved0;
+
+        /* advance to the next component */
+        if (!chSaved0)
+            return;
+        psz = pszEnd + 1;
+        my_assert(*psz != '/' && *psz != '\\');
+    }
+#undef my_assert
+}
+
+/*
  * Convert to forward slashes. Resolve to full pathname optionally
  */
@@ -76 +193 @@
     else
         strncpy(w32_path, filename, sizeof (w32_path));
+
+    w32_fixcase(w32_path);
 
     for (p = w32_path; p && *p; p++)

trunk/src/kDepPre/Makefile.kmk

@@ -29 +29 @@
 kDepPre_TEMPLATE        = BIN
 kDepPre_DEFS.linux      = HAVE_FGETC_UNLOCKED=1
-kDepPre_DEFS.win32      = NEED_ISBLANK=1
+kDepPre_DEFS.win32      = NEED_ISBLANK=1 __WIN32__=1
 kDepPre_SOURCES         = $(PATH_CURRENT)/kDepPre.c
 

trunk/src/kDepPre/kDepPre.c

@@ -30 +30 @@
 #include <string.h>
 #include <ctype.h>
+#ifdef __WIN32__
+#include <windows.h>
+#endif 
 
 #ifdef HAVE_FGETC_UNLOCKED 
@@ -68 +71 @@
 
 
+#ifdef __WIN32__
+/**
+ * Corrects the case of a path.
+ * 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.
+ */
+void w32_fixcase(char *pszPath)
+{
+#define my_assert(expr) \
+    do { \
+        if (!(expr)) { \
+            printf("my_assert: %s, file %s, line %d\npszPath=%s\npsz=%s\n", \
+                   #expr, __FILE__, __LINE__, pszPath, psz); \
+            __asm { __asm int 3 } \
+            exit(1); \
+        } \
+    } while (0)
+    
+    char *psz = pszPath;
+    if (*psz == '/' || *psz == '\\')
+    {
+        if (psz[1] == '/' || psz[1] == '\\')
+        {
+            /* UNC */
+            my_assert(psz[1] == '/' || psz[1] == '\\');
+            my_assert(psz[2] != '/' && psz[2] != '\\');
+
+            /* skip server name */
+            psz += 2;
+            while (*psz != '\\' && *psz != '/')
+            {
+                if (!*psz)
+                    return;
+                *psz++ = toupper(*psz);
+            }
+
+            /* skip the share name */
+            psz++;
+            my_assert(*psz != '/' && *psz != '\\');
+            while (*psz != '\\' && *psz != '/')
+            {
+                if (!*psz)
+                    return;
+                *psz++ = toupper(*psz);
+            }
+            my_assert(*psz == '/' || *psz == '\\');
+            psz++;
+        }
+        else
+        {
+            /* Unix spec */
+            psz++;
+        }
+    }
+    else
+    {
+        /* Drive letter */
+        my_assert(psz[1] == ':');
+        *psz = toupper(*psz);
+        my_assert(psz[0] >= 'A' && psz[0] <= 'Z');
+        my_assert(psz[2] == '/' || psz[2] == '\\');
+        psz += 3;
+    }
+
+    /*
+     * Pointing to the first char after the unc or drive specifier.
+     */
+    while (*psz)
+    {
+        WIN32_FIND_DATA FindFileData;
+        HANDLE hDir;
+        char chSaved0;
+        char chSaved1;
+        char *pszEnd;
+
+
+        /* find the end of the component. */
+        pszEnd = psz;
+        while (*pszEnd && *pszEnd != '/' && *pszEnd != '\\')
+            pszEnd++;
+
+        /* replace the end with "?\0" */
+        chSaved0 = pszEnd[0];
+        chSaved1 = pszEnd[1];
+        pszEnd[0] = '?';
+        pszEnd[1] = '\0';
+
+        /* find the right filename. */
+        hDir = FindFirstFile(pszPath, &FindFileData);
+        pszEnd[1] = chSaved1;
+        if (!hDir)
+        {
+            pszEnd[0] = chSaved0;
+            return;
+        }
+        pszEnd[0] = '\0';
+        while (stricmp(FindFileData.cFileName, psz))
+        {
+            if (!FindNextFile(hDir, &FindFileData))
+            {
+                pszEnd[0] = chSaved0;
+                return;
+            }
+        }
+        strcpy(psz, FindFileData.cFileName);
+        pszEnd[0] = chSaved0;
+
+        /* advance to the next component */
+        if (!chSaved0)
+            return;
+        psz = pszEnd + 1;
+        my_assert(*psz != '/' && *psz != '\\');
+    }
+#undef my_assert
+}
+
+#endif 
+
+
 /**
  * Prints the dependency chain.
@@ -85 +209 @@
             &&  pDep->szFilename[pDep->cchFilename - 1] == '>')
             continue;
-
+#ifdef __WIN32__
+        {
+        char szFilename[_MAX_PATH + 1];
+        if (_fullpath(szFilename, pDep->szFilename, sizeof(szFilename)))
+            w32_fixcase(szFilename);
         fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
+        }
+#else        
+        fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
+#endif        
     }
     fprintf(pOutput, "\n\n");
@@ -105 +237 @@
 static unsigned sdbm(const char *str)
 {
-    const char *pszStart;
     unsigned hash = 0;
     int c;