Changeset 585Tweet

Timestamp:

May 6, 2011, 7:47:13 PM (12 years ago)

Author:

Sam Hocevar

Message:

tool: compute and display SPEC item CRCs.

Location:

abuse/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• crc.cpp (modified) (1 diff)
• crc.h (modified) (1 diff)
• tool/abuse-tool.cpp (modified) (5 diffs)

abuse/trunk/src/Makefile.am

@@ -70 +70 @@
 
 abuse_tool_SOURCES = \
-    tool/abuse-tool.cpp
+    tool/abuse-tool.cpp \
+    crc.cpp crc.h
 abuse_tool_LDADD = imlib/libimlib.a
 abuse_tool_DEPENDENCIES = $(abuse_tool_LDADD)

abuse/trunk/src/crc.cpp

@@ -15 +15 @@
 #include "crc.h"
 
-uint16_t calc_crc(uint8_t *buf, int len)
+uint16_t calc_crc(void *buf, size_t len)
 {
-  uint8_t c1=0,c2=0;
-  while (len)
-  {
-    len--;
-    c1+=*buf;
-    c2+=c1;
-    buf++;
-  }
-  return (c2<<8)|c1;
+    uint8_t *data = (uint8_t *)buf;
+    uint8_t c1 = 0, c2 = 0;
+
+    while (len--)
+        c2 += (c1 += *data++);
+
+    return (c2 << 8) | c1;
 }
 

abuse/trunk/src/crc.h

@@ -11 +11 @@
 #ifndef _CRC_HPP_
 #define _CRC_HPP_
+
 #include "specs.h"
 
-uint16_t calc_crc(uint8_t *buf, int len);
+uint16_t calc_crc(void *buf, size_t len);
 uint32_t crc_file(bFILE *fp);
 
+#endif
 
-#endif

abuse/trunk/src/tool/abuse-tool.cpp

@@ -20 +20 @@
 #include "image.h"
 #include "pcxread.h"
+#include "crc.h"
 
 static void Usage();
@@ -123 +124 @@
     if (cmd == CMD_LIST)
     {
-        printf("   id  type     size  name & information\n");
-        printf(" ----  ----  -------  ----------------------------\n");
+        printf("   id  type    bytes   crc  name & information\n");
+        printf(" ----  ----  -------  ----  ----------------------------\n");
+
+        dir.FullyLoad(&fp);
 
         for (int i = 0; i < dir.total; i++)
@@ -131 +134 @@
 
             /* Print basic information */
-            printf("% 5i   % 3i % 8i  %s",
-                   i, se->type, (int)se->size, se->name);
+            printf("% 5i   % 3i % 8i  %04x  %s", i, se->type, (int)se->size,
+                   calc_crc(se->data, se->size), se->name);
 
             /* Is there anything special to say? */
@@ -144 +147 @@
               {
                 image *im = new image(&fp, se);
-                printf(" (%i x %i pixels)", im->Size().x, im->Size().y);
+                printf(" \t# %i x %i pixels", im->Size().x, im->Size().y);
                 delete im;
                 break;
@@ -151 +154 @@
               {
                 palette *pal = new palette(se, &fp);
-                printf(" (%i colors)", pal->pal_size());
+                printf(" \t# %i colors", pal->pal_size());
                 delete pal;
                 break;
               }
+#if 0
+            default:
+              {
+                /* Try to print a representation of the item */
+                int has_binary = 0;
+                for (int i = 0; i < Min(20, (int)se->size); i++)
+                {
+                    uint8_t ch = ((uint8_t *)se->data)[i];
+                    if (ch < 0x20 || ch >= 0x7f)
+                        has_binary++;
+                }
+                if (has_binary <= 2 && se->size > 5)
+                    has_binary = 0;
+
+                printf(" \t# ");
+                if (!has_binary)
+                    putchar('\"');
+
+                size_t max = Min(has_binary ? 15 : 30, (int)se->size);
+                for (size_t i = 0; i < max; i++)
+                {
+                    uint8_t ch = ((uint8_t *)se->data)[i];
+                    if (has_binary)
+                        printf("%02x ", ch);
+                    else if (ch && (ch < 0x20 || ch >= 0x7f))
+                        printf("\\x%02x", ch);
+                    else if (ch)
+                        putchar(ch);
+                    else
+                        printf("\\0");
+                }
+                if (se->size > max)
+                    printf("...");
+                else if (!has_binary)
+                    printf("\"");
+                break;
+              }
+#endif
             }