Browse Source

Add the last of the original tools dispsig and srchsig

Closes #22
nemerle 8 years ago
parent
commit
f210ed78c2
5 changed files with 374 additions and 452 deletions
  1. 1 0
      tools/CMakeLists.txt
  2. 9 0
      tools/dispsrch/CMakeLists.txt
  3. 156 203
      tools/dispsrch/dispsig.cpp
  4. 207 249
      tools/dispsrch/srchsig.cpp
  5. 1 0
      tools/readsig/readsig.cpp

+ 1 - 0
tools/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(dispsrch)
 add_subdirectory(makedsig)
 add_subdirectory(readsig)
 add_subdirectory(parsehdr)

+ 9 - 0
tools/dispsrch/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_executable(dispsig dispsig)
+
+target_link_libraries(dispsig dcc_hash)
+qt5_use_modules(dispsig Core)
+
+add_executable(srchsig srchsig)
+
+target_link_libraries(srchsig dcc_hash dcc_lib)
+qt5_use_modules(srchsig Core)

+ 156 - 203
tools/dispsrch/dispsig.cpp

@@ -1,191 +1,164 @@
 /* Quick program to copy a named signature to a small file */
 
+#include "perfhlib.h"
+
+#include <QtCore/QString>
+#include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <memory.h>
 #include <string.h>
-#include "perfhlib.h"
 
 /* statics */
-byte buf[100];
-int	numKeys;			/* Number of hash table entries (keys) */
-int numVert;			/* Number of vertices in the graph (also size of g[]) */
-int PatLen;				/* Size of the keys (pattern length) */
-int SymLen;				/* Max size of the symbols, including null */
-FILE *f;				/* File being read */
-FILE *f2;				/* File being written */
+uint8_t buf[100];
+int numKeys; /* Number of hash table entries (keys) */
+int numVert; /* Number of vertices in the graph (also size of g[]) */
+int PatLen;  /* Size of the keys (pattern length) */
+int SymLen;  /* Max size of the symbols, including null */
+FILE *f;     /* File being read */
+FILE *f2;    /* File being written */
 
-static	word	*T1base, *T2base;	/* Pointers to start of T1, T2 */
-static	word	*g;					/* g[] */
+static uint16_t *T1base, *T2base; /* Pointers to start of T1, T2 */
+static uint16_t *g;               /* g[] */
 
 /* prototypes */
 void grab(int n);
-word readFileShort(void);
+uint16_t readFileShort(void);
 void cleanup(void);
 
-
-#define SYMLEN      16
-#define PATLEN      23
+#define SYMLEN 16
+#define PATLEN 23
 
 /* Hash table structure */
-typedef struct HT_tag
-{
-    char    htSym[SYMLEN];
-    byte    htPat[PATLEN];
+typedef struct HT_tag {
+    char htSym[SYMLEN];
+    uint8_t htPat[PATLEN];
 } HT;
 
-HT  ht;                 /* One hash table entry */
-
-void
-main(int argc, char *argv[])
-{
-	word w, len;
-	int i;
-
-	if (argc <= 3)
-	{
-		printf("Usage: dispsig <SigFilename> <FunctionName> <BinFileName>\n");
-		printf("Example: dispsig dccm8s.sig printf printf.bin\n");
-		exit(1);
-	}
-
-	if ((f = fopen(argv[1], "rb")) == NULL)
-	{
-		printf("Cannot open %s\n", argv[1]);
-		exit(2);
-	}
-
-	if ((f2 = fopen(argv[3], "wb")) == NULL)
-	{
-		printf("Cannot write to %s\n", argv[3]);
-		exit(2);
-	}
-
-
-	/* Read the parameters */
-	grab(4);
-	if (memcmp("dccs", buf, 4) != 0)
-	{
-		printf("Not a dccs file!\n");
-		exit(3);
-	}
-	numKeys = readFileShort();
-	numVert = readFileShort();
-	PatLen = readFileShort();
-	SymLen = readFileShort();
-
-	/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
-	hashParams(						/* Set the parameters for the hash table */
-		numKeys,					/* The number of symbols */
-		PatLen,						/* The length of the pattern to be hashed */
-		256,						/* The character set of the pattern (0-FF) */
-		0,							/* Minimum pattern character value */
-		numVert);					/* Specifies C, the sparseness of the graph.
-										See Czech, Havas and Majewski for details
-									*/
-
-	T1base	= readT1();
-	T2base	= readT2();
-	g		= readG();
-
-	/* Read T1 and T2 tables */
-	grab(2);
-	if (memcmp("T1", buf, 2) != 0)
-	{
-		printf("Expected 'T1'\n");
-		exit(3);
-	}
-	len = PatLen * 256 * sizeof(word);
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of T1: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(T1base, 1, len, f) != len)
-	{
-		printf("Could not read T1\n");
-		exit(5);
-	}
-
-	grab(2);
-	if (memcmp("T2", buf, 2) != 0)
-	{
-		printf("Expected 'T2'\n");
-		exit(3);
-	}
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of T2: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(T2base, 1, len, f) != len)
-	{
-		printf("Could not read T2\n");
-		exit(5);
-	}
-
-	/* Now read the function g[] */
-	grab(2);
-	if (memcmp("gg", buf, 2) != 0)
-	{
-		printf("Expected 'gg'\n");
-		exit(3);
-	}
-	len = numVert * sizeof(word);
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of g[]: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(g, 1, len, f) != len)
-	{
-		printf("Could not read T2\n");
-		exit(5);
-	}
-
-
-	/* This is now the hash table */
-	grab(2);
-	if (memcmp("ht", buf, 2) != 0)
-	{
-		printf("Expected 'ht'\n");
-		exit(3);
-	}
-	w = readFileShort();
-	if (w != numKeys * (SymLen + PatLen + sizeof(word)))
-	{
-		printf("Problem with size of hash table: file %d, calc %d\n", w, len);
-		exit(6);
-	}
-
-
-	for (i=0; i < numKeys; i++)
-	{
-        if (fread(&ht, 1, SymLen + PatLen, f) != (size_t)(SymLen + PatLen))
-        {
+HT ht; /* One hash table entry */
+PerfectHash g_pattern_hasher;
+int main(int argc, char *argv[]) {
+    uint16_t w, len;
+    int i;
+
+    if (argc <= 3) {
+        printf("Usage: dispsig <SigFilename> <FunctionName> <BinFileName>\n");
+        printf("Example: dispsig dccm8s.sig printf printf.bin\n");
+        exit(1);
+    }
+
+    if ((f = fopen(argv[1], "rb")) == NULL) {
+        printf("Cannot open %s\n", argv[1]);
+        exit(2);
+    }
+
+    if ((f2 = fopen(argv[3], "wb")) == NULL) {
+        printf("Cannot write to %s\n", argv[3]);
+        exit(2);
+    }
+
+    /* Read the parameters */
+    grab(4);
+    if (memcmp("dccs", buf, 4) != 0) {
+        printf("Not a dccs file!\n");
+        exit(3);
+    }
+    numKeys = readFileShort();
+    numVert = readFileShort();
+    PatLen = readFileShort();
+    SymLen = readFileShort();
+
+    /* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
+    g_pattern_hasher.setHashParams(
+                    numKeys,                /* The number of symbols */
+                    PatLen,                 /* The length of the pattern to be hashed */
+                    256,                    /* The character set of the pattern (0-FF) */
+                    0,                      /* Minimum pattern character value */
+                    numVert);               /* Specifies C, the sparseness of the graph. See Czech, Havas and Majewski for details */
+
+    T1base  = g_pattern_hasher.readT1();
+    T2base  = g_pattern_hasher.readT2();
+    g       = g_pattern_hasher.readG();
+
+
+    /* Read T1 and T2 tables */
+    grab(2);
+    if (memcmp("T1", buf, 2) != 0) {
+        printf("Expected 'T1'\n");
+        exit(3);
+    }
+    len = PatLen * 256 * sizeof(uint16_t);
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of T1: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(T1base, 1, len, f) != len) {
+        printf("Could not read T1\n");
+        exit(5);
+    }
+
+    grab(2);
+    if (memcmp("T2", buf, 2) != 0) {
+        printf("Expected 'T2'\n");
+        exit(3);
+    }
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of T2: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(T2base, 1, len, f) != len) {
+        printf("Could not read T2\n");
+        exit(5);
+    }
+
+    /* Now read the function g[] */
+    grab(2);
+    if (memcmp("gg", buf, 2) != 0) {
+        printf("Expected 'gg'\n");
+        exit(3);
+    }
+    len = numVert * sizeof(uint16_t);
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of g[]: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(g, 1, len, f) != len) {
+        printf("Could not read T2\n");
+        exit(5);
+    }
+
+    /* This is now the hash table */
+    grab(2);
+    if (memcmp("ht", buf, 2) != 0) {
+        printf("Expected 'ht'\n");
+        exit(3);
+    }
+    w = readFileShort();
+    if (w != numKeys * (SymLen + PatLen + sizeof(uint16_t))) {
+        printf("Problem with size of hash table: file %d, calc %d\n", w, len);
+        exit(6);
+    }
+    QString argv2(argv[2]);
+    for (i = 0; i < numKeys; i++) {
+        if (fread(&ht, 1, SymLen + PatLen, f) != (size_t)(SymLen + PatLen)) {
             printf("Could not read pattern %d from %s\n", i, argv[1]);
             exit(7);
         }
-        if (stricmp(ht.htSym, argv[2]) == 0)
-        {
+        if (argv2.compare(ht.htSym, Qt::CaseInsensitive) == 0) {
             /* Found it! */
             break;
         }
-
-	}
+    }
     fclose(f);
-    if (i == numKeys)
-    {
+    if (i == numKeys) {
         printf("Function %s not found!\n", argv[2]);
         exit(2);
     }
 
     printf("Function %s index %d\n", ht.htSym, i);
-    for (i=0; i < PatLen; i++)
-    {
+    for (i = 0; i < PatLen; i++) {
         printf("%02X ", ht.htPat[i]);
     }
 
@@ -193,56 +166,36 @@ main(int argc, char *argv[])
     fclose(f2);
 
     printf("\n");
-
-
-}
-
-
-void
-cleanup(void)
-{
-	/* Free the storage for variable sized tables etc */
-	if (T1base)	free(T1base);
-	if (T2base)	free(T2base);
-	if (g) free(g);
 }
 
-void grab(int n)
-{
-	if (fread(buf, 1, n, f) != (size_t)n)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
+void cleanup(void) {
+    /* Free the storage for variable sized tables etc */
+    if (T1base)
+        free(T1base);
+    if (T2base)
+        free(T2base);
+    if (g)
+        free(g);
 }
 
-word
-readFileShort(void)
-{
-	byte b1, b2;
-
-	if (fread(&b1, 1, 1, f) != 1)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
-	if (fread(&b2, 1, 1, f) != 1)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
-	return (b2 << 8) + b1;
+void grab(int n) {
+    if (fread(buf, 1, n, f) != (size_t)n) {
+        printf("Could not read\n");
+        exit(11);
+    }
 }
 
-/* Following two functions not needed unless creating tables */
-
-void getKey(int i, byte **keys)
-{
-}
+uint16_t readFileShort(void) {
+    uint8_t b1, b2;
 
-/* Display key i */
-void
-dispKey(int i)
-{
+    if (fread(&b1, 1, 1, f) != 1) {
+        printf("Could not read\n");
+        exit(11);
+    }
+    if (fread(&b2, 1, 1, f) != 1) {
+        printf("Could not read\n");
+        exit(11);
+    }
+    return (b2 << 8) + b1;
 }
 

+ 207 - 249
tools/dispsrch/srchsig.cpp

@@ -1,287 +1,245 @@
 /* Quick program to see if a pattern is in a sig file. Pattern is supplied
-	in a small .bin or .com style file */
+    in a small .bin or .com style file */
 
+#include "perfhlib.h"
+
+#include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <memory.h>
-#include "perfhlib.h"
 
 /* statics */
-byte buf[100];
-int	numKeys;			/* Number of hash table entries (keys) */
-int numVert;			/* Number of vertices in the graph (also size of g[]) */
-int PatLen;				/* Size of the keys (pattern length) */
-int SymLen;				/* Max size of the symbols, including null */
-FILE *f;				/* Sig file being read */
-FILE *fpat;				/* Pattern file being read */
+uint8_t buf[100];
+int numKeys; /* Number of hash table entries (keys) */
+int numVert; /* Number of vertices in the graph (also size of g[]) */
+int PatLen;  /* Size of the keys (pattern length) */
+int SymLen;  /* Max size of the symbols, including null */
+FILE *f;     /* Sig file being read */
+FILE *fpat;  /* Pattern file being read */
 
-static	word	*T1base, *T2base;	/* Pointers to start of T1, T2 */
-static	word	*g;					/* g[] */
+static uint16_t *T1base, *T2base; /* Pointers to start of T1, T2 */
+static uint16_t *g;               /* g[] */
 
 #define SYMLEN 16
 #define PATLEN 23
 
-typedef struct HT_tag
-{
-	/* Hash table structure */
-	char	htSym[SYMLEN];
-	byte	htPat[PATLEN];
+typedef struct HT_tag {
+    /* Hash table structure */
+    char htSym[SYMLEN];
+    uint8_t htPat[PATLEN];
 } HT;
 
-HT *ht;					/* Declare a pointer to a hash table */
+HT *ht; /* Declare a pointer to a hash table */
 
 /* prototypes */
 void grab(int n);
-word readFileShort(void);
+uint16_t readFileShort(void);
 void cleanup(void);
-void fixWildCards(char *buf);		/* In fixwild.c */
+extern void fixWildCards(uint8_t pat[]); /* In fixwild.c */
 void pattSearch(void);
+PerfectHash g_pattern_hasher;
+
+int main(int argc, char *argv[]) {
+    uint16_t w, len;
+    int h, i;
+    int patlen;
+
+    if (argc <= 2) {
+        printf("Usage: srchsig <SigFilename> <PattFilename>\n");
+        printf("Searches the signature file for the given pattern\n");
+        printf("e.g. %s dccm8s.sig mypatt.bin\n", argv[0]);
+        exit(1);
+    }
 
+    if ((f = fopen(argv[1], "rb")) == NULL) {
+        printf("Cannot open signature file %s\n", argv[1]);
+        exit(2);
+    }
+
+    if ((fpat = fopen(argv[2], "rb")) == NULL) {
+        printf("Cannot open pattern file %s\n", argv[2]);
+        exit(2);
+    }
 
-void
-main(int argc, char *argv[])
-{
-	word w, len;
-	int h, i;
-	int patlen;
-
-	if (argc <= 2)
-	{
-		printf("Usage: srchsig <SigFilename> <PattFilename>\n");
-		printf("Searches the signature file for the given pattern\n");
-		printf("e.g. %s dccm8s.sig mypatt.bin\n", argv[0]);
-		exit(1);
-	}
-
-	if ((f = fopen(argv[1], "rb")) == NULL)
-	{
-		printf("Cannot open signature file %s\n", argv[1]);
-		exit(2);
-	}
-
-	if ((fpat = fopen(argv[2], "rb")) == NULL)
-	{
-		printf("Cannot open pattern file %s\n", argv[2]);
-		exit(2);
-	}
-
-	/* Read the parameters */
-	grab(4);
-	if (memcmp("dccs", buf, 4) != 0)
-	{
-		printf("Not a dccs file!\n");
-		exit(3);
-	}
-	numKeys = readFileShort();
-	numVert = readFileShort();
-	PatLen = readFileShort();
-	SymLen = readFileShort();
-
-	/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
-	hashParams(						/* Set the parameters for the hash table */
-		numKeys,					/* The number of symbols */
-		PatLen,						/* The length of the pattern to be hashed */
-		256,						/* The character set of the pattern (0-FF) */
-		0,							/* Minimum pattern character value */
-		numVert);					/* Specifies C, the sparseness of the graph.
-										See Czech, Havas and Majewski for details
-									*/
-
-	T1base	= readT1();
-	T2base	= readT2();
-	g		= readG();
-
-	/* Read T1 and T2 tables */
-	grab(2);
-	if (memcmp("T1", buf, 2) != 0)
-	{
-		printf("Expected 'T1'\n");
-		exit(3);
-	}
-	len = PatLen * 256 * sizeof(word);
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of T1: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(T1base, 1, len, f) != len)
-	{
-		printf("Could not read T1\n");
-		exit(5);
-	}
-
-	grab(2);
-	if (memcmp("T2", buf, 2) != 0)
-	{
-		printf("Expected 'T2'\n");
-		exit(3);
-	}
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of T2: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(T2base, 1, len, f) != len)
-	{
-		printf("Could not read T2\n");
-		exit(5);
-	}
-
-	/* Now read the function g[] */
-	grab(2);
-	if (memcmp("gg", buf, 2) != 0)
-	{
-		printf("Expected 'gg'\n");
-		exit(3);
-	}
-	len = numVert * sizeof(word);
-	w = readFileShort();
-	if (w != len)
-	{
-		printf("Problem with size of g[]: file %d, calc %d\n", w, len);
-		exit(4);
-	}
-	if (fread(g, 1, len, f) != len)
-	{
-		printf("Could not read T2\n");
-		exit(5);
-	}
-
-
-	/* This is now the hash table */
-	/* First allocate space for the table */
-	if ((ht = (HT *)malloc(numKeys * sizeof(HT))) == 0)
-	{
-		printf("Could not allocate hash table\n");
-		exit(1);
-	}
-	grab(2);
-	if (memcmp("ht", buf, 2) != 0)
-	{
-		printf("Expected 'ht'\n");
-		exit(3);
-	}
-	w = readFileShort();
-	if (w != numKeys * (SymLen + PatLen + sizeof(word)))
-	{
-		printf("Problem with size of hash table: file %d, calc %d\n", w, len);
-		exit(6);
-	}
-
-	for (i=0; i < numKeys; i++)
-	{
-		if ((int)fread(&ht[i], 1, SymLen + PatLen, f) != SymLen + PatLen)
-		{
-			printf("Could not read\n");
-			exit(11);
-		}
-	}
-
-	/* Read the pattern to buf */
-	if ((patlen = fread(buf, 1, 100, fpat)) == 0)
-	{
-		printf("Could not read pattern\n");
-		exit(11);
-	}
-    if (patlen != PATLEN)
-    {
+    /* Read the parameters */
+    grab(4);
+    if (memcmp("dccs", buf, 4) != 0) {
+        printf("Not a dccs file!\n");
+        exit(3);
+    }
+    numKeys = readFileShort();
+    numVert = readFileShort();
+    PatLen = readFileShort();
+    SymLen = readFileShort();
+
+    /* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
+    g_pattern_hasher.setHashParams(
+                numKeys,  /* The number of symbols */
+                PatLen,   /* The length of the pattern to be hashed */
+                256,      /* The character set of the pattern (0-FF) */
+                0,        /* Minimum pattern character value */
+                numVert); /* Specifies C, the sparseness of the graph. See Czech, Havas
+                   and Majewski for details */
+
+    T1base = g_pattern_hasher.readT1();
+    T2base = g_pattern_hasher.readT2();
+    g = g_pattern_hasher.readG();
+
+    /* Read T1 and T2 tables */
+    grab(2);
+    if (memcmp("T1", buf, 2) != 0) {
+        printf("Expected 'T1'\n");
+        exit(3);
+    }
+    len = PatLen * 256 * sizeof(uint16_t);
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of T1: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(T1base, 1, len, f) != len) {
+        printf("Could not read T1\n");
+        exit(5);
+    }
+
+    grab(2);
+    if (memcmp("T2", buf, 2) != 0) {
+        printf("Expected 'T2'\n");
+        exit(3);
+    }
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of T2: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(T2base, 1, len, f) != len) {
+        printf("Could not read T2\n");
+        exit(5);
+    }
+
+    /* Now read the function g[] */
+    grab(2);
+    if (memcmp("gg", buf, 2) != 0) {
+        printf("Expected 'gg'\n");
+        exit(3);
+    }
+    len = numVert * sizeof(uint16_t);
+    w = readFileShort();
+    if (w != len) {
+        printf("Problem with size of g[]: file %d, calc %d\n", w, len);
+        exit(4);
+    }
+    if (fread(g, 1, len, f) != len) {
+        printf("Could not read T2\n");
+        exit(5);
+    }
+
+    /* This is now the hash table */
+    /* First allocate space for the table */
+    if ((ht = (HT *)malloc(numKeys * sizeof(HT))) == 0) {
+        printf("Could not allocate hash table\n");
+        exit(1);
+    }
+    grab(2);
+    if (memcmp("ht", buf, 2) != 0) {
+        printf("Expected 'ht'\n");
+        exit(3);
+    }
+    w = readFileShort();
+    if (w != numKeys * (SymLen + PatLen + sizeof(uint16_t))) {
+        printf("Problem with size of hash table: file %d, calc %d\n", w, len);
+        exit(6);
+    }
+
+    for (i = 0; i < numKeys; i++) {
+        if ((int)fread(&ht[i], 1, SymLen + PatLen, f) != SymLen + PatLen) {
+            printf("Could not read\n");
+            exit(11);
+        }
+    }
+
+    /* Read the pattern to buf */
+    if ((patlen = fread(buf, 1, 100, fpat)) == 0) {
+        printf("Could not read pattern\n");
+        exit(11);
+    }
+    if (patlen != PATLEN) {
         printf("Error: pattern length is %d, should be %d\n", patlen, PATLEN);
         exit(12);
     }
 
-	/* Fix the wildcards */
-	fixWildCards(buf);
-
-	printf("Pattern:\n");
-	for (i=0; i < PATLEN; i++)
-		printf("%02X ", buf[i]);
-	printf("\n");
-
-
-	h = hash(buf);
-	printf("Pattern hashed to %d (0x%X), symbol %s\n", h, h, ht[h].htSym);
-	if (memcmp(ht[h].htPat, buf, PATLEN) == 0)
-	{
-		printf("Pattern matched");
-	}
-	else
-	{
-		printf("Pattern mismatch: found following pattern\n");
-		for (i=0; i < PATLEN; i++)
-			printf("%02X ", ht[h].htPat[i]);
-		printf("\n");
-		pattSearch();						/* Look for it the hard way */
-	}
-	cleanup();
-	free(ht);
-	fclose(f);
-	fclose(fpat);
-
+    /* Fix the wildcards */
+    fixWildCards(buf);
+
+    printf("Pattern:\n");
+    for (i = 0; i < PATLEN; i++)
+        printf("%02X ", buf[i]);
+    printf("\n");
+
+    h = g_pattern_hasher.hash(buf);
+    printf("Pattern hashed to %d (0x%X), symbol %s\n", h, h, ht[h].htSym);
+    if (memcmp(ht[h].htPat, buf, PATLEN) == 0) {
+        printf("Pattern matched");
+    } else {
+        printf("Pattern mismatch: found following pattern\n");
+        for (i = 0; i < PATLEN; i++)
+            printf("%02X ", ht[h].htPat[i]);
+        printf("\n");
+        pattSearch(); /* Look for it the hard way */
+    }
+    cleanup();
+    free(ht);
+    fclose(f);
+    fclose(fpat);
+    return 0;
 }
 
-void pattSearch(void)
-{
-	int i;
-
-	for (i=0; i < numKeys; i++)
-	{
-		if ((i % 100) == 0) printf("\r%d ", i);
-		if (memcmp(ht[i].htPat, buf, PATLEN) == 0)
-		{
-			printf("\nPattern matched offset %d (0x%X)\n", i, i);
-		}
-	}
-	printf("\n");
-}
+void pattSearch(void) {
+    int i;
 
+    for (i = 0; i < numKeys; i++) {
+        if ((i % 100) == 0)
+            printf("\r%d ", i);
+        if (memcmp(ht[i].htPat, buf, PATLEN) == 0) {
+            printf("\nPattern matched offset %d (0x%X)\n", i, i);
+        }
+    }
+    printf("\n");
+}
 
-void
-cleanup(void)
-{
-	/* Free the storage for variable sized tables etc */
-	if (T1base)	free(T1base);
-	if (T2base)	free(T2base);
-	if (g) free(g);
+void cleanup(void) {
+    /* Free the storage for variable sized tables etc */
+    if (T1base)
+        free(T1base);
+    if (T2base)
+        free(T2base);
+    if (g)
+        free(g);
 }
 
-void grab(int n)
-{
-	if (fread(buf, 1, n, f) != (size_t)n)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
+void grab(int n) {
+    if (fread(buf, 1, n, f) != (size_t)n) {
+        printf("Could not read\n");
+        exit(11);
+    }
 }
 
-word
-readFileShort(void)
-{
-	byte b1, b2;
-
-	if (fread(&b1, 1, 1, f) != 1)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
-	if (fread(&b2, 1, 1, f) != 1)
-	{
-		printf("Could not read\n");
-		exit(11);
-	}
-	return (b2 << 8) + b1;
+uint16_t readFileShort(void) {
+    uint8_t b1, b2;
+
+    if (fread(&b1, 1, 1, f) != 1) {
+        printf("Could not read\n");
+        exit(11);
+    }
+    if (fread(&b2, 1, 1, f) != 1) {
+        printf("Could not read\n");
+        exit(11);
+    }
+    return (b2 << 8) + b1;
 }
 
 /* Following two functions not needed unless creating tables */
 
-void getKey(int i, byte **keys)
-{
-}
+void getKey(int i, uint8_t **keys) {}
 
 /* Display key i */
-void
-dispKey(int i)
-{
-}
-
+void dispKey(int i) {}

+ 1 - 0
tools/readsig/readsig.cpp

@@ -187,6 +187,7 @@ int main(int argc, char *argv[])
 void
 cleanup(void)
 {
+    // TODO: g_pattern_hasher.hashCleanup();
     /* Free the storage for variable sized tables etc */
     if (T1base)	free(T1base);
     if (T2base)	free(T2base);