Changeset 1046 in kBuild for trunk/src

Timestamp:

Jun 9, 2007 4:56:00 AM (18 years ago)

Author:

bird

Message:

Added an extension to the default cache name. changed the magic for object entry files.

File:

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

trunk/src/kObjCache/kObjCache.c

@@ -1152 +1152 @@
          */
         if (    !fgets(g_szLine, sizeof(g_szLine), pFile)
-            ||  strcmp(g_szLine, "magic=kObjCache-1\n"))
+            ||  strcmp(g_szLine, "magic=kObjCacheEntry-v0.1.0\n"))
         {
             InfoMsg(2, "bad cache file (magic)\n");
@@ -1344 +1344 @@
         do { int cch = expr; if (cch >= KOBJCACHE_MAX_LINE_LEN) FatalDie("Line too long: %d (max %d)\nexpr: %s\n", cch, KOBJCACHE_MAX_LINE_LEN, #expr); } while (0)
 
-    fprintf(pFile, "magic=kObjCache-1\n");
+    fprintf(pFile, "magic=kObjCacheEntry-v0.1.0\n");
     CHECK_LEN(fprintf(pFile, "target=%s\n", pEntry->New.pszTarget ? pEntry->New.pszTarget : pEntry->Old.pszTarget));
     CHECK_LEN(fprintf(pFile, "key=%u\n", (unsigned long)pEntry->uKey));
@@ -3655 +3655 @@
     enum { kOC_Options, kOC_CppArgv, kOC_CcArgv, kOC_BothArgv } enmMode = kOC_Options;
 
+    size_t cch;
     char *psz;
     int i;
@@ -3777 +3778 @@
     /*
      * Calc the cache file name.
+     * It's a bit messy since the extension has to be replaced.
      */
     if (!pszCacheFile)
@@ -3784 +3786 @@
         if (!pszCacheName)
         {
-            pszCacheName = FindFilenameInPath(pszEntryFile);
-            if (!*pszCacheName)
+            psz = (char *)FindFilenameInPath(pszEntryFile);
+            if (!*psz)
                 return SyntaxError("The cache file (-f) specifies a directory / nothing!\n");
-            pszCacheName = xstrdup(pszCacheName);
+            cch = psz - pszEntryFile;
+            pszCacheName = memcpy(xmalloc(cch + 5), psz, cch + 1);
             psz = strrchr(pszCacheName, '.');
-            if (psz > pszCacheName)
-                *psz = '\0';
+            if (!psz || psz <= pszCacheName)
+                psz = (char *)pszCacheName + cch;
+            memcpy(psz, ".koc", sizeof(".koc") - 1);
         }
         pszCacheFile = MakePathFromDirAndFile(pszCacheName, pszCacheDir);
@@ -3796 +3800 @@
 
     /*
-     * Create and initialize the two bojects we'll be working on.
+     * Create and initialize the two objects we'll be working on.
      *
      * We're supposed to be the only ones actually writing to the local file,