fix isxspace warnings.

default to assuming libintl.

Author: ennorehling

CMakeLists.txt

@@ -1,10 +1,13 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8...3.20)
 project (echeck C)
 
 add_executable(echeck echeck.c unicode.c whereami.c)
 add_executable(tests echeck.c unicode.c tests.c whereami.c CuTest.c)
 target_compile_definitions (tests PRIVATE TESTING=1)
 
+if (MSVC)
+target_compile_definitions (echeck PRIVATE /Wx)
+endif (MSVC)
 if (WIN32)
 find_library(Intl_LIBRARY NAMES libintl intl
   DOC "libintl libraries (if not in the C library)")
@@ -17,12 +20,12 @@ find_package(Intl)
 include_directories(${Intl_INCLUDE_DIR})
 
 if (Intl_FOUND)
-target_compile_definitions (echeck PRIVATE HAVE_GETTEXT=1)
-target_compile_definitions (tests PRIVATE HAVE_GETTEXT=1)
 target_link_libraries(echeck ${Intl_LIBRARIES})
 target_link_libraries(tests ${Intl_LIBRARIES})
 else (Intl_FOUND)
 message(STATUS "libintl not found")
+target_compile_definitions (echeck PRIVATE NO_GETTEXT=1)
+target_compile_definitions (tests PRIVATE NO_GETTEXT=1)
 endif (Intl_FOUND)
 
 include("Localization.cmake")

echeck.c

@@ -44,7 +44,7 @@
 #include "unicode.h"
 #include "whereami.h"
 
-#ifdef HAVE_GETTEXT
+#ifndef NO_GETTEXT
 #include <libintl.h>
 #include <locale.h>
 #else
@@ -87,9 +87,9 @@ int AddTestSuites(CuSuite * suite, const char *names);
 
 #include <string.h>
 
-#define isxspace(c) (c==194 || c==160 || isspace(c))
+#define isxspace(c) ((c)==194 || (c)==160 || isspace(c))
 
-static const char *echeck_version = "4.5.7";
+static const char *echeck_version = "4.5.8";
 
 #define DEFAULT_PATH "."
 
@@ -783,8 +783,9 @@ int Pow(int p)
 
 #define iswxspace(c) (c==160 || iswspace(c))
 
-char *eatwhite(char *ptr)
+char *eatwhite(char *input)
 {
+  unsigned char *ptr = (unsigned char *)input;
   while (*ptr) {
     ucs4_t ucs;
     size_t size = 0;
@@ -1062,11 +1063,10 @@ void readskill(char *s)
   }
   sk->name = STRDUP(transliterate(buffer, sizeof(buffer), s));
   if (x) {
-    s = (char *)(x + 1);
-    while (isxspace(*s))
-      s++;
-    if (*s)
-      sk->kosten = atoi(s);
+    unsigned char *p = (unsigned char *)(x + 1);
+    while (isxspace(*p)) ++p;
+    if (*p)
+      sk->kosten = atoi(p);
   }
   sk->next = skilldata;
   skilldata = sk;
@@ -1310,7 +1310,7 @@ int parsefile(char *s, int typ)
     if (!x)
       return 0;
     y = x + 1;
-    while (isxspace(*(x - 1)))
+    while (isxspace(*((unsigned char *)x - 1)))
       x--;
     *x = 0;
     for (i = 1; i < UT_MAX; i++)
@@ -2115,15 +2115,15 @@ char *getbuf(void)
       if (c > 0 && isxspace(c)) {
         if (eatwhite) {
           do {
-            c = *(++bp);
+            c = *(unsigned char *)++bp;
           }
           while (bp != lbuf + MAXLINE && isxspace(*bp));
           if (!quote && !start)
             *(cp++) = ' ';
         } else {
           do {
             *(cp++) = SPACE_REPLACEMENT;
-            c = *(++bp);
+            c = *(unsigned char *)++bp;
           }
           while (cp != warn_buf + MAXLINE && bp != lbuf + MAXLINE
             && c > 0 && isxspace(c));
@@ -5020,7 +5020,7 @@ void process_order_file(int *faction_count, int *unit_count)
       x = strchr(order_buf, ';');
       if (x) {
         x++;
-        while (isxspace(*x))
+        while (isxspace(*(unsigned char *)x))
           x++;
         if (r->name)
           free(r->name);
@@ -5300,7 +5300,7 @@ void init(void)
   filename = getenv("ECHECKOPTS");
 }
 
-#ifdef HAVE_GETTEXT
+#ifndef NO_GETTEXT
 #ifdef WIN32
 #define PATH_SEP '\\'
 #else
@@ -5351,7 +5351,7 @@ void init_intl(void)
 int main(int argc, char *argv[])
 {
   int faction_count = 0, unit_count = 0, nextarg = 1, i;
-#ifdef HAVE_GETTEXT
+#ifndef NO_GETTEXT
   init_intl();
 #endif
 #if macintosh

unicode.h

@@ -26,7 +26,7 @@ extern "C" {
 #include <wchar.h>
 #define USE_UNICODE
   typedef unsigned long ucs4_t;
-  typedef char utf8_t;
+  typedef unsigned char utf8_t;
 
   extern int unicode_utf8_to_cp437(char *result, const utf8_t * utf8_string,
     size_t * length);