Upgrade get_vocab_id() to handle empty strings.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index 30b3277d0e3a3bda2d0405ef18fb15e01be8cc14..6e3656f50fd90e9144e9f27177fc9a10673391ad 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -10,19 +10,7 @@
 #include "advent.h"
 #include "dungeon.h"
 
-char* xstrdup(const char* s)
-{
-    char* ptr = strdup(s);
-    if (ptr == NULL) {
-        // LCOV_EXCL_START
-        // exclude from coverage analysis because we can't simulate an out of memory error in testing
-        fprintf(stderr, "Out of memory!\n");
-        exit(EXIT_FAILURE);
-    }
-    return (ptr);
-}
-
-void* xmalloc(size_t size)
+static void* xmalloc(size_t size)
 {
     void* ptr = malloc(size);
     if (ptr == NULL) {
@@ -202,20 +190,6 @@ void vspeak(const char* msg, bool blank, va_list ap)
                 size -= len;
             }
 
-            // All-lowercase specifier.
-            if (msg[i] == 'L' ||
-                msg[i] == 'C') {
-                packed_to_token(arg, renderp); /* unpack directly to destination */
-                int len = strlen(renderp);
-                for (int j = 0; j < len; ++j) {
-                    renderp[j] = tolower(renderp[j]);
-                }
-                if (msg[i] == 'C') // First char uppercase, rest lowercase.
-                    renderp[0] = toupper(renderp[0]);
-                renderp += len;
-                size -= len;
-            }
-
             previous_arg = arg;
         }
     }
@@ -293,19 +267,24 @@ void echo_input(FILE* destination, const char* input_prompt, const char* input)
     free(prompt_and_input);
 }
 
-int word_count(char* s)
+int word_count(char* str)
 {
-    char* copy = xstrdup(s);
     char delims[] = " \t";
     int count = 0;
-    char* word;
+    int inblanks = true;
+
+    for (char *s = str; *s; s++)
+       if (inblanks) {
+           if (strchr(delims, *s) == 0) {
+               ++count;
+               inblanks = false;
+           }
+       } else {
+           if (strchr(delims, *s) != 0) {
+               inblanks = true;
+           }
+       }
 
-    word = strtok(copy, delims);
-    while (word != NULL) {
-        word = strtok(NULL, delims);
-        ++count;
-    }
-    free(copy);
     return (count);
 }
 
@@ -504,6 +483,10 @@ int get_special_vocab_id(const char* word)
 long get_vocab_id(const char* word)
 // Search the vocab categories in order for the supplied word.
 {
+    /* Check for an empty string */
+    if (strncmp(word, "", sizeof("")) == 0)
+      return (WORD_EMPTY);
+
     long ref_num;
 
     /* FIXME: Magic numbers related to vocabulary */