Changeset 1005 in kBuild

Timestamp:

Jun 2, 2007 1:54:25 PM (18 years ago)

Author:

bird

Message:

debugging. kind of working now...

File:

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

trunk/src/kObjCache/kObjCache.c

@@ -62 +62 @@
 /** The max line length in a cache file. */
 #define KOBJCACHE_MAX_LINE_LEN  16384
+#if defined(__WIN__)
+# define PATH_SLASH '\\'
+#else
+# define PATH_SLASH '/'
+#endif 
+#if defined(__OS2__) || defined(__WIN__)
+# define IS_SLASH(ch)       ((ch) == '/' || (ch) == '\\')
+# define IS_SLASH_DRV(ch)   ((ch) == '/' || (ch) == '\\' || (ch) == ':')
+#else
+# define IS_SLASH(ch)       ((ch) == '/')
+# define IS_SLASH_DRV(ch)   ((ch) == '/')
+#endif 
+
 
 
@@ -578 +591 @@
     kObjCacheVerbose(pEntry, "precompiled file is %lu bytes long\n", (unsigned long)pEntry->cbNewCppMapping);
 
+    memset(&pEntry->NewSum, 0, sizeof(pEntry->NewSum));
     pEntry->NewSum.crc32 = crc32(0, pEntry->pszNewCppMapping, pEntry->cbNewCppMapping);
     MD5Init(&MD5Ctx);
@@ -827 +841 @@
     const char *pszFilename = strchr(pszPath, '\0') - 1;
     while (     pszFilename > pszPath 
-#if defined(__OS2__) || defined(__WIN__)
-           &&   pszFilename[-1] != ':' && pszFilename[-1] != '/' && pszFilename[-1] != '\\')
-#else
-           &&   pszFilename[-1] != '/')
-#endif
+           &&   !IS_SLASH_DRV(pszFilename[-1]))
         pszFilename--;
     return pszFilename;
@@ -850 +860 @@
     char *pszBuf = xmalloc(cchName + cchDir + 2);
     memcpy(pszBuf, pszDir, cchDir);
-#if defined(__OS2__) || defined(__WIN__)
-    if (cchDir > 0 && pszDir[cchDir - 1] != '/' && pszDir[cchDir - 1] != '\\' && pszDir[cchDir - 1] != ':')
-#else
-    if (cchDir > 0 && pszDir[cchDir - 1] != '/')
-#endif 
-        pszBuf[cchDir++] = '/';
+    if (cchDir > 0 && !IS_SLASH_DRV(pszDir[cchDir - 1]))
+        pszBuf[cchDir++] = PATH_SLASH;
     memcpy(pszBuf + cchDir, pszName, cchName + 1);
     return pszBuf;
@@ -937 +943 @@
     if (pszRet)
     {
-#if defined(__OS2__) || defined(__WIN__)
-        while (*pszRet == ':' || *pszRet == '/' || *pszRet == '\\')
-#else
-        while (*pszRet == '/')
-#endif 
+        while (IS_SLASH_DRV(*pszRet))
             pszRet++;
         pszRet = xstrdup(pszRet);
@@ -1002 +1004 @@
     char *pszOldPath = MakePathFromDirAndFile(pszOldName, pszDir);
     char *pszNewPath = MakePathFromDirAndFile(pszNewName, pszDir);
-    int rc = rename(pszOldName, pszNewName);
+    int rc = rename(pszOldPath, pszNewPath);
     free(pszOldPath);
     free(pszNewPath);
@@ -1045 +1047 @@
     int SavedErrno;
     char *pszPath = MakePathFromDirAndFile(pszName, pszDir);
-    int fd = open(pszName, O_RDONLY | O_BINARY);
+    int fd = open(pszPath, O_RDONLY | O_BINARY);
     if (fd >= 0)
     {