Changeset 2409 in kBuild for trunk/src/kObjCache/kObjCache.c

Timestamp:

Jun 16, 2010 11:46:56 PM (15 years ago)

Author:

bird

Message:

kObjCache: windows _spawnvp quoting and some other fixes.

File:

• trunk/src/kObjCache/kObjCache.c (modified) (8 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -70 +70 @@
 #if defined(__WIN__)
 # include <Windows.h>
+# include "quoted_spawn.h"
 #endif
 
@@ -325 +326 @@
  * @param   pszPath1    The first path.
  * @param   pszPath2    The second path.
- * @param   cch         The number of characters to compare.
- */
-static int ArePathsIdentical(const char *pszPath1, const char *pszPath2, size_t cch)
+ */
+static int ArePathsIdentical(const char *pszPath1, const char *pszPath2)
 {
 #if defined(__OS2__) || defined(__WIN__)
-    if (strnicmp(pszPath1, pszPath2, cch))
+    if (stricmp(pszPath1, pszPath2))
     {
         /* Slashes may differ, compare char by char. */
         const char *psz1 = pszPath1;
         const char *psz2 = pszPath2;
-        for (;cch; psz1++, psz2++, cch--)
+        for (;;)
+        {
+            if (*psz1 != *psz2)
+            {
+                if (    tolower(*psz1) != tolower(*psz2)
+                    &&  toupper(*psz1) != toupper(*psz2)
+                    &&  *psz1 != '/'
+                    &&  *psz1 != '\\'
+                    &&  *psz2 != '/'
+                    &&  *psz2 != '\\')
+                    return 0;
+            }
+            if (!*psz1)
+                break;
+            psz1++;
+            psz2++;
+        }
+    }
+    return 1;
+#else
+    return !strcmp(pszPath1, pszPath2);
+#endif
+}
+
+/**
+ * Compares two path strings to see if they are identical.
+ *
+ * This doesn't do anything fancy, just the case ignoring and
+ * slash unification.
+ *
+ * @returns 1 if equal, 0 otherwise.
+ * @param   pszPath1    The first path.
+ * @param   pszPath2    The second path.
+ * @param   cch         The number of characters to compare.
+ */
+static int ArePathsIdenticalN(const char *pszPath1, const char *pszPath2, size_t cch)
+{
+#if defined(__OS2__) || defined(__WIN__)
+    if (strnicmp(pszPath1, pszPath2, cch))
+    {
+        /* Slashes may differ, compare char by char. */
+        const char *psz1 = pszPath1;
+        const char *psz2 = pszPath2;
+        for ( ; cch; psz1++, psz2++, cch--)
         {
             if (*psz1 != *psz2)
@@ -372 +415 @@
      * This is indeed a bit tricky, so we'll try the easy way first...
      */
-    if (ArePathsIdentical(pszPath, pszDir, cchDir))
+    if (ArePathsIdenticalN(pszPath, pszDir, cchDir))
     {
         if (pszPath[cchDir])
@@ -382 +425 @@
     {
         pszAbsPath = AbsPath(pszPath);
-        if (ArePathsIdentical(pszAbsPath, pszDir, cchDir))
+        if (ArePathsIdenticalN(pszAbsPath, pszDir, cchDir))
         {
             if (pszPath[cchDir])
@@ -1144 +1187 @@
         size_t cch = strlen(papszArgv[i]);
         if (    cch < cchIgnorePath
-            ||  !ArePathsIdentical(papszArgv[i] + cch - cchIgnorePath, pszIgnorePath, cch))
+            ||  !ArePathsIdenticalN(papszArgv[i] + cch - cchIgnorePath, pszIgnorePath, cch))
             kOCSumUpdate(pSum, &Ctx, papszArgv[i], cch + 1);
     }
@@ -1581 +1624 @@
 
     errno = 0;
+# ifdef __WIN__
+    rc = quoted_spawnvp(_P_WAIT, papszArgv[0], papszArgv);
+# else
     rc = _spawnvp(_P_WAIT, papszArgv[0], papszArgv);
+# endif
     if (rc < 0)
         FatalDie("%s - _spawnvp failed (rc=0x%p): %s\n", pszMsg, rc, strerror(errno));
     if (rc > 0)
         FatalDie("%s - failed rc=%d\n", pszMsg, (int)rc);
-    if (fdStdOut)
+    if (fdStdOut != -1)
     {
         close(STDOUT_FILENO);
@@ -1684 +1731 @@
 #if defined(__OS2__) || defined(__WIN__)
     errno = 0;
+# ifdef __WIN__
+    pid = quoted_spawnvp(_P_NOWAIT, papszArgv[0], papszArgv);
+# else
     pid = _spawnvp(_P_NOWAIT, papszArgv[0], papszArgv);
+# endif
     if (pid == -1)
         FatalDie("precompile - _spawnvp failed: %s\n", strerror(errno));
@@ -3490 +3541 @@
         PKOCDIGEST pDigest = &pCache->paDigests[i];
         if (ArePathsIdentical(kOCDigestAbsPath(pDigest, pCache->pszDir),
-                              kOCEntryAbsPath(pEntry), ~0U))
+                              kOCEntryAbsPath(pEntry)))
         {
             unsigned cLeft;