Changeset 3324 in kBuild for trunk

Timestamp:

Apr 17, 2020 1:14:39 AM (5 years ago)

Author:

bird

Message:

kDepObj: Added code for parsing /ZH:SHA_256 as produced by 14.16.27023.

File:

• trunk/src/kmk/kmkbuiltin/kDepObj.c (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin/kDepObj.c

@@ -703 +703 @@
         uSrc.pb = uSrcFiles.pb + off;
         u16Type = uSrc.pu16[2];
-        cbSrc = u16Type == 0x0110 ? 6 + 16 + 2 : 6 + 2;
+        switch (u16Type)
+        {
+            case 0x0110:    cbSrc = 6 + 16 + 2; break;  /* MD5 */
+            case 0x0214:    cbSrc = 6 + 20 + 2; break;  /* SHA1 */ /** @todo check this */
+            case 0x0320:    cbSrc = 6 + 32 + 2; break;  /* SHA-256 */
+            default:        cbSrc = 6 + 0  + 2; break;
+        }
         if (off + cbSrc > cbSrcFiles)
             return kDepErr(pThis, 1, "CV source file entry at %08" KX32_PRI " is too long; cbSrc=%#" KX32_PRI " cbSrcFiles=%#" KX32_PRI,
@@ -722 +728 @@
          */
         depAdd(&pThis->Core, pszFile, cchFile);
-        if (u16Type == 0x0110)
-            dprintf(("#%03" KU32_PRI ": {todo-md5-todo} '%s'\n",
-                     iSrc, pszFile));
-        else
-            dprintf(("#%03" KU32_PRI ": type=%#06" KX16_PRI " '%s'\n", iSrc, u16Type, pszFile));
+#ifdef WITH_DPRINTF
+        dprintf(("#%03" KU32_PRI ": ", iSrc));
+        {
+            KU32 off = 6;
+            for (;off < cbSrc - 2; off++)
+                dprintf(("%02" KX8_PRI, uSrc.pb[off]));
+            if (cbSrc == 6)
+                dprintf(("type=%#06" KX16_PRI, u16Type));
+            dprintf((" '%s'\n", pszFile));
+        }
+#endif