Changeset 1043 in kBuild

Timestamp:

Jun 8, 2007 10:36:21 PM (18 years ago)

Author:

bird

Message:

made it build on darwin.

File:

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

trunk/src/kObjCache/kObjCache.c

@@ -1454 +1454 @@
  * @param   cArgv           The number of arguments in the vector.
  */
-static void kOCEntrySpawn(PCKOCENTRY pEntry, const char **papszArgv, unsigned cArgv, const char *pszMsg, const char *pszStdOut)
+static void kOCEntrySpawn(PCKOCENTRY pEntry, const char * const *papszArgv, unsigned cArgv, const char *pszMsg, const char *pszStdOut)
 {
 #if defined(__OS2__) || defined(__WIN__)
@@ -1545 +1545 @@
  * @param   pszMsg          Message to start the info/error messages with.
  */
-static pid_t kOCEntrySpawnChild(PCKOCENTRY pEntry, const char **papszArgv, unsigned cArgv, int fdStdIn, int fdStdOut, const char *pszMsg)
+static pid_t kOCEntrySpawnChild(PCKOCENTRY pEntry, const char * const *papszArgv, unsigned cArgv, int fdStdIn, int fdStdOut, const char *pszMsg)
 {
     pid_t pid;
@@ -1680 +1680 @@
  *                          for servicing the child output and closing the pipe.
  */
-static void kOCEntrySpawnProducer(PKOCENTRY pEntry, const char **papszArgv, unsigned cArgv, const char *pszMsg,
+static void kOCEntrySpawnProducer(PKOCENTRY pEntry, const char * const *papszArgv, unsigned cArgv, const char *pszMsg,
                                   void (*pfnConsumer)(PKOCENTRY, int))
 {
@@ -1704 +1704 @@
  *                          for serving the child input and closing the pipe.
  */
-static void kOCEntrySpawnConsumer(PKOCENTRY pEntry, const char **papszArgv, unsigned cArgv, const char *pszMsg,
+static void kOCEntrySpawnConsumer(PKOCENTRY pEntry, const char * const *papszArgv, unsigned cArgv, const char *pszMsg,
                                   void (*pfnProducer)(PKOCENTRY, int))
 {
@@ -1729 +1729 @@
  *                          for servicing the child output and closing the pipe.
  */
-static void kOCEntrySpawnTee(PKOCENTRY pEntry, const char **papszProdArgv, unsigned cProdArgv,
-                             const char **papszConsArgv, unsigned cConsArgv,
+static void kOCEntrySpawnTee(PKOCENTRY pEntry, const char * const *papszProdArgv, unsigned cProdArgv,
+                             const char * const *papszConsArgv, unsigned cConsArgv,
                              const char *pszMsg, void (*pfnTeeConsumer)(PKOCENTRY, int, int))
 {
@@ -1877 +1877 @@
  * @param   cArgvPreComp        The number of arguments.
  */
-static void kOCEntryPreCompile(PKOCENTRY pEntry, const char **papszArgvPreComp, unsigned cArgvPreComp)
+static void kOCEntryPreCompile(PKOCENTRY pEntry, const char * const *papszArgvPreComp, unsigned cArgvPreComp)
 {
     /*
@@ -2041 +2041 @@
             kOCEntryReadCppOutput(pEntry, &pEntry->New, 0 /* fatal */);
         InfoMsg(1, "compiling -> '%s'...\n", pEntry->New.pszObjName);
-        kOCEntrySpawnConsumer(pEntry, pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile,
+        kOCEntrySpawnConsumer(pEntry, (const char * const *)pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile,
                               "compile", kOCEntryCompileProducer);
     }
@@ -2049 +2049 @@
             kOCEntryWriteCppOutput(pEntry, 1 /* free it */);
         InfoMsg(1, "compiling -> '%s'...\n", pEntry->New.pszObjName);
-        kOCEntrySpawn(pEntry, pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile, "compile", NULL);
+        kOCEntrySpawn(pEntry, (const char * const *)pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile, "compile", NULL);
     }
 }
@@ -2145 +2145 @@
  * @param   cArgvPreComp        The number of arguments.
  */
-static void kOCEntryPreCompileAndCompile(PKOCENTRY pEntry, const char **papszArgvPreComp, unsigned cArgvPreComp)
+static void kOCEntryPreCompileAndCompile(PKOCENTRY pEntry, const char * const *papszArgvPreComp, unsigned cArgvPreComp)
 {
     if (    pEntry->fPipedCompile
@@ -2166 +2166 @@
          */
         kOCEntrySpawnTee(pEntry, papszArgvPreComp, cArgvPreComp,
-                         pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile,
+                         (const char * const *)pEntry->New.papszArgvCompile, pEntry->New.cArgvCompile,
                          "precompile|compile", kOCEntryTeeConsumer);
     }
@@ -2584 +2584 @@
             if (errno == EINTR)
                 continue;
-            if (eof(fdSrc))
-                break;
             FatalDie("read '%s' failed: %s\n", pszSrc, strerror(errno));
         }
+        if (!cbRead)
+            break; /* eof */
 
         /* write the chunk. */
@@ -3285 +3285 @@
         FatalDie("Failed to lock the cache file: Windows Error %d\n", GetLastError());
 #else
-# error port me....
+    if (flock(pCache->fd, LOCK_EX) != 0)
+        FatalDie("Failed to lock the cache file: %s\n", strerror(errno));
 #endif
     pCache->fLocked = 1;
@@ -3337 +3338 @@
         FatalDie("Failed to unlock the cache file: Windows Error %d\n", GetLastError());
 #else
-# error port me....
+    if (flock(pCache->fd, LOCK_UN) != 0)
+        FatalDie("Failed to unlock the cache file: %s\n", strerror(errno));
 #endif
     pCache->fLocked = 0;