diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2025-06-29 20:48:41 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2025-06-29 20:48:41 -0400 |
| commit | 129a10d1ee57a047ae9a3084e175de1e7daf6ffe (patch) | |
| tree | 079c753b5a9e4856c121a1a2eb59dc6ceba9396f /src/linebuffer.c | |
| parent | Ignore .cache (diff) | |
| download | cli-129a10d1ee57a047ae9a3084e175de1e7daf6ffe.zip | |
Fix justify behavior
Diffstat (limited to 'src/linebuffer.c')
| -rw-r--r-- | src/linebuffer.c | 139 |
1 files changed, 80 insertions, 59 deletions
diff --git a/src/linebuffer.c b/src/linebuffer.c index 6dfb6c3..772ba77 100644 --- a/src/linebuffer.c +++ b/src/linebuffer.c @@ -1,89 +1,110 @@ #include "linebuffer.h" - +#include "strlcat.h" #include <ctype.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "strlcat.h" +#define NULL_TERMINATOR_LEN 1 LineBuffer *linebuffer_create(size_t buffer_capacity) { - LineBuffer *lb = malloc(sizeof(LineBuffer)); - if (lb == NULL) { - return NULL; - } - lb->_buffer = malloc(buffer_capacity + 1); - if (lb->_buffer == NULL) { - free(lb); - return NULL; - } - memset(lb->_buffer, 0, buffer_capacity + 1); - lb->_num_words = 0; - lb->_buffer_length = 0; - lb->_buffer_capacity = buffer_capacity; - return lb; + LineBuffer *lb = malloc(sizeof(LineBuffer)); + if (lb == NULL) { + return NULL; + } + lb->_buffer = malloc(buffer_capacity + NULL_TERMINATOR_LEN); + if (lb->_buffer == NULL) { + free(lb); + return NULL; + } + memset(lb->_buffer, 0, buffer_capacity + NULL_TERMINATOR_LEN); + lb->_num_words = 0; + lb->_buffer_length = 0; + lb->_buffer_capacity = buffer_capacity; + return lb; } void linebuffer_destroy(LineBuffer *lb) { - free(lb->_buffer); - free(lb); + free(lb->_buffer); + free(lb); } void linebuffer_clear(LineBuffer *lb) { - memset(lb->_buffer, 0, lb->_buffer_capacity + 1); - lb->_num_words = 0; - lb->_buffer_length = 0; + memset(lb->_buffer, 0, lb->_buffer_capacity + NULL_TERMINATOR_LEN); + lb->_num_words = 0; + lb->_buffer_length = 0; } -void linebuffer_append_word(LineBuffer *lb, const char *word) { - if (lb->_num_words > 0) { - lb->_buffer[lb->_buffer_length] = ' '; - lb->_buffer[lb->_buffer_length + 1] = '\0'; - lb->_buffer_length++; - } - strlcat(lb->_buffer, word, (lb->_buffer_capacity + 1) - lb->_buffer_length); - lb->_buffer_length += strlen(word); - lb->_num_words++; +bool linebuffer_append_word(LineBuffer *lb, const char *word) { + if (!linebuffer_can_fit(lb, word)) { + return false; + } + if (lb->_num_words > 0) { + lb->_buffer[lb->_buffer_length] = ' '; + lb->_buffer_length++; + } + strlcat(lb->_buffer, word, lb->_buffer_capacity + NULL_TERMINATOR_LEN); + lb->_buffer_length += strlen(word); + lb->_num_words++; + return true; +} + +bool linebuffer_can_fit(LineBuffer *lb, const char *word) { + size_t append_len = strlen(word); + if (lb->_num_words > 0) { + // Account for space before the word + append_len++; + } + return append_len <= linebuffer_space_remaining(lb); } size_t linebuffer_space_remaining(LineBuffer *lb) { - return lb->_buffer_capacity - lb->_buffer_length; + return lb->_buffer_capacity - lb->_buffer_length; } int linebuffer_write(LineBuffer *lb, FILE *fp) { - if (lb->_buffer_length > 0) { - return fputs(lb->_buffer, fp); + int return_code = 0; + if (lb->_buffer_length > 0) { + return_code = fputs(lb->_buffer, fp); + if (return_code == EOF) { + return EOF; } - return 0; + return_code = fputc('\n', fp); + if (return_code == EOF) { + return EOF; + } + } + return return_code; } int linebuffer_write_justified(LineBuffer *lb, FILE *fp) { - int return_code = 0; - size_t words_remaining = lb->_num_words; - size_t extra_spaces = linebuffer_space_remaining(lb); - size_t spaces_to_insert = 0; + int return_code = 0; + size_t words_remaining = lb->_num_words; + size_t extra_spaces = linebuffer_space_remaining(lb); + size_t spaces_to_insert = 0; - for (size_t i = 0; i < lb->_buffer_length; i++) { - if (!isspace(lb->_buffer[i])) { - return_code = fputc(lb->_buffer[i], fp); - if (return_code == EOF) { - return EOF; - } - } else { - spaces_to_insert = extra_spaces / (words_remaining - 1); - extra_spaces -= spaces_to_insert; - for (size_t j = 1; j <= spaces_to_insert + 1; j++) { - return_code = fputc(' ', fp); - if (return_code == EOF) { - return EOF; - } - } - words_remaining--; - } - } - return_code = fputc('\n', fp); - if (return_code == EOF) { + for (size_t i = 0; i < lb->_buffer_length; i++) { + if (!isspace(lb->_buffer[i])) { + return_code = fputc(lb->_buffer[i], fp); + if (return_code == EOF) { return EOF; + } + } else { + spaces_to_insert = extra_spaces / (words_remaining - 1); + extra_spaces -= spaces_to_insert; + for (size_t j = 1; j <= spaces_to_insert + 1; j++) { + return_code = fputc(' ', fp); + if (return_code == EOF) { + return EOF; + } + } + words_remaining--; } - return return_code; + } + return_code = fputc('\n', fp); + if (return_code == EOF) { + return EOF; + } + return return_code; } |