Changeset 1016 in kBuild

Timestamp:

Jun 2, 2007 6:58:41 PM (18 years ago)

Author:

bird

Message:

Unix/mac fixes.

File:

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

trunk/src/kObjCache/kObjCache.c

@@ -555 +555 @@
         if (pszStdOut)
         {
+            int fdReDir;
+
             close(1);
             fdReDir = open(pszStdOut, O_CREAT | O_TRUNC | O_WRONLY, 0777);
@@ -568 +570 @@
         }
 
-        execvp(papszArgv[0], papszArgv);
-        kObjCacheFatal(pEntry, "%s - execvp failed rc=%d errno=%d %s\n", 
-                       pszMsg, rc, errno, strerror(errno));
+        execvp(papszArgv[0], (char **)papszArgv);
+        kObjCacheFatal(pEntry, "%s - execvp failed: %s\n", 
+                       pszMsg, strerror(errno));
     }
     if (pid == -1)
         kObjCacheFatal(pEntry, "%s - fork() failed: %s\n", pszMsg, strerror(errno));
 
-    pidWait = waitpid(pid, &iStatus);
+    pidWait = waitpid(pid, &iStatus, 0);
     while (pidWait < 0 && errno == EINTR)
-        pidWait = waitpid(pid, &iStatus);
+        pidWait = waitpid(pid, &iStatus, 0);
     if (pidWait != pid)
         kObjCacheFatal(pEntry, "%s - waitpid failed rc=%d: %s\n", 
@@ -644 +646 @@
     if (!pid)
     {
-        execvp(papszArgv[0], papszArgv);
-        kObjCacheFatal(pEntry, "%s - execvp failed rc=%d errno=%d %s\n", 
-                       pszMsg, rc, errno, strerror(errno));
+        execvp(papszArgv[0], (char **)papszArgv);
+        kObjCacheFatal(pEntry, "%s - execvp failed: %s\n", 
+                       pszMsg, strerror(errno));
     }
     if (pid == -1)
@@ -661 +663 @@
      * Read data from the child.
      */
-    cbAlloc = pEntry->cbOldCpp ? (pEntry->cbOldCpp + 4*1024*1024) & ~(4*1024*1024 - 1) : 4*1024*1024;
+    cbAlloc = pEntry->cbOldCpp ? (pEntry->cbOldCpp + 4*1024*1024 + 4096) & ~(4*1024*1024 - 1) : 4*1024*1024;
     cbLeft = cbAlloc;
     *ppszOutput = psz = xmalloc(cbAlloc);
     for (;;)
     {
-        long cbRead = _read(fds[0], psz, cbLeft);
+        long cbRead = read(fds[0], psz, cbLeft);
         if (!cbRead)
             break;
@@ -699 +701 @@
         kObjCacheFatal(pEntry, "%s - failed with rc %d\n", pszMsg, iStatus);
 #else
-    pidWait = waitpid(pid, &iStatus);
+    pidWait = waitpid(pid, &iStatus, 0);
     while (pidWait < 0 && errno == EINTR)
-        pidWait = waitpid(pid, &iStatus);
+        pidWait = waitpid(pid, &iStatus, 0);
     if (pidWait != pid)
         kObjCacheFatal(pEntry, "%s - waitpid failed rc=%d: %s\n", 
@@ -745 +747 @@
     pEntry->NewSum.crc32 = crc32(0, pEntry->pszNewCppMapping, pEntry->cbNewCpp);
     MD5Init(&MD5Ctx);
-    MD5Update(&MD5Ctx, pEntry->pszNewCppMapping, pEntry->cbNewCpp);
+    MD5Update(&MD5Ctx, (unsigned char *)pEntry->pszNewCppMapping, pEntry->cbNewCpp);
     MD5Final(&pEntry->NewSum.md5[0], &MD5Ctx);
     kObjCacheVerbose(pEntry, "crc32=%#lx md5=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",