From 364420db88dd8c390d4ea50d3c607a2d8737b12f Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Mon, 25 Jan 2021 09:57:55 -0800
Subject: [PATCH] Fix lispcmp bytecmp (#211)

* Correct signedness of 2nd parameter of lispcmp().

* Be clear that comparison of characters in bytecmp is unsigned since GETBYTE returns unsigned char.

* Make bytecmp() and lispcmp() helper functions static and removed from mkatomdefs.h.

* If no BYTESWAP we need to include <string.h> for memcmp()

* Use (uint8_t) rather than (unsigned char) in bytecmp when comparing to GETBYTE()
---
 inc/mkatomdefs.h |  2 --
 src/mkatom.c     | 31 ++++++++++++++++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/inc/mkatomdefs.h b/inc/mkatomdefs.h
index 39a7ce8..17c9d58 100644
--- a/inc/mkatomdefs.h
+++ b/inc/mkatomdefs.h
@@ -3,9 +3,7 @@
 DLword compute_hash(const char *char_base, DLword offset, DLword length);
 DLword compute_lisp_hash(const char *char_base, DLword offset, DLword length, DLword fatp);
 LispPTR compare_chars(register const char *char1, register const char *char2, register DLword length);
-int bytecmp(const char *char1, const char *char2, int len);
 LispPTR compare_lisp_chars(register const char *char1, register const char *char2, register DLword length, DLword fat1, DLword fat2);
-int lispcmp(const DLword *char1, const unsigned char *char2, int len);
 LispPTR make_atom(const char *char_base, DLword offset, DLword length, short int non_numericp);
 LispPTR parse_number(const char *char_base, short int length);
 #endif
diff --git a/src/mkatom.c b/src/mkatom.c
index 8181645..f3997e2 100644
--- a/src/mkatom.c
+++ b/src/mkatom.c
@@ -31,6 +31,10 @@
 */
 /**********************************************************************/
 
+#ifndef BYTESWAP
+#include <string.h>
+#endif
+#include <stdint.h>
 #include "lispemul.h"
 #include "adr68k.h"
 #include "lsptypes.h"
@@ -128,6 +132,17 @@ DLword compute_lisp_hash(const char *char_base, DLword offset, DLword length, DL
 
 } /* end compute_lisp_hash */
 
+#ifdef BYTESWAP
+int bytecmp(const char *char1, const char *char2, int len)
+{
+  int index;
+  for (index = 0; index < len; index++) {
+      if (GETBYTE(char1++) != *(uint8_t *)(char2++)) return (0);
+  }
+  return (1);
+}
+#endif /* BYTESWAP */
+
 /**********************************************************************/
 /*
         Func name :	compare_chars
@@ -160,16 +175,14 @@ LispPTR compare_chars(register const char *char1, register const char *char2, re
   }
 
 } /* end compare_chars */
-#ifdef BYTESWAP
-int bytecmp(const char *char1, const char *char2, int len)
-{
+
+int lispcmp(const DLword *char1, const char *char2, int len) {
   int index;
   for (index = 0; index < len; index++) {
-    if (GETBYTE(char1++) != *(char2++)) return (0);
+      if (GETWORD(char1++) != GETBYTE(char2++)) return (0);
   }
   return (1);
 }
-#endif /* BYTESWAP */
 
 /**********************************************************************/
 /*
@@ -231,14 +244,6 @@ LispPTR compare_lisp_chars(register const char *char1, register const char *char
 
 } /* end compare_lisp_chars */
 
-int lispcmp(const DLword *char1, const unsigned char *char2, int len) {
-  int index;
-  for (index = 0; index < len; index++) {
-      if (GETWORD(char1++) != (unsigned char)GETBYTE(char2++)) return (0);
-  }
-  return (1);
-}
-
 /**********************************************************************/
 /*
         Func name :	make_atom