X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=c16e9afd9dac2edf08610635ba09ca2dbeb9fb4b;hp=aef3eff81da99c528bce205e1ed9e5a4b1f77a66;hb=9714bf8c82c37b1c320e078285fca03d81eea614;hpb=d9d089bdcc31698970747fc829edb057c0a0da5b

diff --git a/misc.c b/misc.c
index aef3eff..c16e9af 100644
--- a/misc.c
+++ b/misc.c
@@ -176,7 +176,9 @@ void vspeak(const char* msg, va_list ap)
     char* rendered = xmalloc(size);
     char* renderp = rendered;
 
-    // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s.
+    // Handle format specifiers (including the custom %C, %L, %S) by
+    // adjusting the parameter accordingly, and replacing the
+    // specifier with %s.
     long previous_arg = 0;
     for (int i = 0; i < msglen; i++) {
         if (msg[i] != '%') {
@@ -187,7 +189,10 @@ void vspeak(const char* msg, va_list ap)
             if (arg == -1)
                 arg = 0;
             i++;
-            // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this.
+            // Integer specifier. In order to accommodate the fact
+            // that PARMS can have both legitimate integers *and*
+            // packed tokens, stringify everything. Future work may
+            // eliminate the need for this.
             if (msg[i] == 'd') {
                 int ret = snprintf(renderp, size, "%ld", arg);
                 if (ret < size) {
@@ -212,6 +217,14 @@ void vspeak(const char* msg, va_list ap)
                 }
             }
 
+            /* Version specifier */
+            if (msg[i] == 'V') {
+                strcpy(renderp, VERSION);
+                size_t len = strlen(VERSION);
+                renderp += len;
+                size -= len;
+            }
+
             // All-lowercase specifier.
             if (msg[i] == 'L' || msg[i] == 'C') {
                 packed_to_token(arg, renderp); /* unpack directly to destination */
@@ -229,7 +242,7 @@ void vspeak(const char* msg, va_list ap)
         }
     }
     *renderp = 0;
-
+    
     // Print the message.
     printf("%s\n", rendered);
 
@@ -332,15 +345,18 @@ char* get_input()
                 printf("%s", input_prompt);
             // LCOV_EXCL_STOP
             ssize_t numread = getline(&input, &n, stdin);
-            if (numread == -1) // Got EOF; return with it.
+            if (numread == -1) { // Got EOF; return with it.
+                free(input);
                 return (NULL);
+            }
         }
 
         if (input == NULL) // Got EOF; return with it.
             return (input);
-        else if (input[0] == '#') // Ignore comments.
+        else if (input[0] == '#') { // Ignore comments.
+            linenoiseFree(input);
             continue;
-        else // We have a 'normal' line; leave the loop.
+        } else // We have a 'normal' line; leave the loop.
             break;
     }
 
@@ -376,6 +392,8 @@ bool silent_yes()
         char* firstword = (char*) xmalloc(strlen(reply) + 1);
         sscanf(reply, "%s", firstword);
 
+        linenoiseFree(reply);
+
         for (int i = 0; i < (int)strlen(firstword); ++i)
             firstword[i] = tolower(firstword[i]);
 
@@ -395,7 +413,6 @@ bool silent_yes()
         } else
             rspeak(PLEASE_ANSWER);
     }
-    linenoiseFree(reply);
     return (outcome);
 }
 
@@ -422,6 +439,8 @@ bool yes(const char* question, const char* yes_response, const char* no_response
         char* firstword = (char*) xmalloc(strlen(reply) + 1);
         sscanf(reply, "%s", firstword);
 
+        linenoiseFree(reply);
+
         for (int i = 0; i < (int)strlen(firstword); ++i)
             firstword[i] = tolower(firstword[i]);
 
@@ -442,8 +461,9 @@ bool yes(const char* question, const char* yes_response, const char* no_response
             break;
         } else
             rspeak(PLEASE_ANSWER);
+
     }
-    linenoiseFree(reply);
+
     return (outcome);
 }
 
@@ -506,6 +526,7 @@ long get_vocab_id(const char* word)
 {
     long ref_num;
 
+    /* FIXME: Magic numbers related to vocabulary */
     ref_num = get_motion_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
         return (ref_num + 0); // FIXME: replace with a proper hash