summaryrefslogtreecommitdiff
path: root/src/buffer.c
diff options
context:
space:
mode:
authorAlbert Cervin <albert@acervin.com>2022-12-16 16:53:18 +0100
committerAlbert Cervin <albert@acervin.com>2022-12-17 18:37:07 +0100
commit3deb7c91056779d1f1b2be112e727bc9999ac21d (patch)
treef67863546ccec3562966b53e0d95c630bbbe3cc9 /src/buffer.c
parentd931b14863838a8dceed8cd95c71a75a271cca6b (diff)
downloaddged-3deb7c91056779d1f1b2be112e727bc9999ac21d.tar.gz
dged-3deb7c91056779d1f1b2be112e727bc9999ac21d.tar.xz
dged-3deb7c91056779d1f1b2be112e727bc9999ac21d.zip
Some text fixes
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 4e955e6..17d62af 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -148,7 +148,8 @@ struct buffer buffer_from_file(const char *filename, struct reactor *reactor) {
uint8_t buff[4096];
int bytes = fread(buff, 1, 4096, file);
if (bytes > 0) {
- buffer_add_text(&b, buff, bytes);
+ uint32_t ignore;
+ text_append(b.text, buff, bytes, &ignore, &ignore);
} else if (bytes == 0) {
break; // EOF
} else {
@@ -159,9 +160,6 @@ struct buffer buffer_from_file(const char *filename, struct reactor *reactor) {
fclose(file);
}
- b.dot_col = 0;
- b.dot_line = 0;
-
return b;
}
@@ -187,8 +185,8 @@ void buffer_to_file(struct buffer *buffer) {
int buffer_add_text(struct buffer *buffer, uint8_t *text, uint32_t nbytes) {
uint32_t lines_added, cols_added;
- text_append(buffer->text, buffer->dot_line, buffer->dot_col, text, nbytes,
- &lines_added, &cols_added);
+ text_append_at(buffer->text, buffer->dot_line, buffer->dot_col, text, nbytes,
+ &lines_added, &cols_added);
movev(buffer, lines_added);
if (lines_added > 0) {