X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=c16e9afd9dac2edf08610635ba09ca2dbeb9fb4b;hb=58b44313d33a39285d394b7704d80823f4d15763;hp=59c33bdf847819e8562ca040cb9866ff61196c7f;hpb=94ea37d2bceffd4842a1af8d12c1c43f7e9c9fe8;p=open-adventure.git diff --git a/misc.c b/misc.c index 59c33bd..c16e9af 100644 --- a/misc.c +++ b/misc.c @@ -217,14 +217,14 @@ void vspeak(const char* msg, va_list ap) } } - /* Version specifier */ + /* Version specifier */ if (msg[i] == 'V') { - strcpy(renderp, VERSION); + 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 */ @@ -242,7 +242,7 @@ void vspeak(const char* msg, va_list ap) } } *renderp = 0; - + // Print the message. printf("%s\n", rendered); @@ -345,8 +345,10 @@ 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. @@ -524,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