From 4ddc17ed9c1778aef0320304801492ad9c30450e Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 4 Jul 2024 13:57:22 -0400 Subject: Tweak tests and read_word impl --- src/word.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'src/word.c') diff --git a/src/word.c b/src/word.c index 4b2249b..87643d6 100644 --- a/src/word.c +++ b/src/word.c @@ -1,28 +1,37 @@ #include "word.h" -static int read_char(FILE *fp); +#include int read_word(FILE *fp, char *word, size_t length) { + if (fp == NULL || word == NULL) { + return READ_WORD_ERR_READ; + } + int ch; size_t position = 0; - while ((ch = read_char(fp)) == ' ') + while (isspace(ch = getc(fp))) ; - while (ch != ' ' && ch != EOF) { - if (position < length) { - word[position++] = ch; + while (!isspace(ch) && ch != EOF) { + if (position >= length - 1) { + // Note: -1 to ensure we have space for the null terminator + // Once we hit the end of our available space, we stop reading, + // even if we didn't read the whole word. + break; } - ch = read_char(fp); + word[position++] = ch; + ch = getc(fp); + } + if (length >= 0) { + word[position] = '\0'; } - word[position] = '\0'; - return ch; -} -static inline int read_char(FILE *fp) { - int ch = getc(fp); - if (ch == '\n' || ch == '\t') { - return ' '; + if (ferror(fp)) { + return READ_WORD_ERR_READ; + } + if (position == 0 && ch == EOF) { + return READ_WORD_ERR_EOF; } - return ch; + return READ_WORD_SUCCESS; } -- cgit v1.2.3