aboutsummaryrefslogtreecommitdiffstats
path: root/src/linebuffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/linebuffer.c')
-rw-r--r--src/linebuffer.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/linebuffer.c b/src/linebuffer.c
index 772ba77..6a7a30b 100644
--- a/src/linebuffer.c
+++ b/src/linebuffer.c
@@ -18,7 +18,6 @@ LineBuffer *linebuffer_create(size_t buffer_capacity) {
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;
@@ -31,7 +30,6 @@ void linebuffer_destroy(LineBuffer *lb) {
}
void linebuffer_clear(LineBuffer *lb) {
- memset(lb->_buffer, 0, lb->_buffer_capacity + NULL_TERMINATOR_LEN);
lb->_num_words = 0;
lb->_buffer_length = 0;
}
@@ -44,8 +42,9 @@ bool linebuffer_append_word(LineBuffer *lb, const char *word) {
lb->_buffer[lb->_buffer_length] = ' ';
lb->_buffer_length++;
}
- strlcat(lb->_buffer, word, lb->_buffer_capacity + NULL_TERMINATOR_LEN);
- lb->_buffer_length += strlen(word);
+ size_t word_length = strlen(word);
+ memcpy(lb->_buffer + lb->_buffer_length, word, word_length);
+ lb->_buffer_length += word_length;
lb->_num_words++;
return true;
}
@@ -65,16 +64,16 @@ size_t linebuffer_space_remaining(LineBuffer *lb) {
int linebuffer_write(LineBuffer *lb, FILE *fp) {
int return_code = 0;
- if (lb->_buffer_length > 0) {
- return_code = fputs(lb->_buffer, fp);
- if (return_code == EOF) {
- return EOF;
- }
- return_code = fputc('\n', fp);
+ for (size_t i = 0; i < lb->_buffer_length; i++) {
+ return_code = fputc(lb->_buffer[i], fp);
if (return_code == EOF) {
return EOF;
}
}
+ return_code = fputc('\n', fp);
+ if (return_code == EOF) {
+ return EOF;
+ }
return return_code;
}