From 338bda9c805df8a33dfadaaee71c59482b78d095 Mon Sep 17 00:00:00 2001 From: bx Date: Sun, 3 Apr 2022 08:12:16 +0100 Subject: [PATCH] moved file commmands to c_file.c --- c_save.c => c_file.c | 22 ++++++++++++++++++++++ c_open.c | 21 --------------------- efn.c | 5 +++-- 3 files changed, 25 insertions(+), 23 deletions(-) rename c_save.c => c_file.c (57%) delete mode 100644 c_open.c diff --git a/c_save.c b/c_file.c similarity index 57% rename from c_save.c rename to c_file.c index 3f978cd..1f175aa 100644 --- a/c_save.c +++ b/c_file.c @@ -1,3 +1,24 @@ +void +c_open(char *file) { + FILE *f = fopen(file + 2, "r"); + if(f == NULL) { puts("couldnt open file."); return; } + b_truncate(buffer); + Row *row = buffer; + while (1) { + size_t red = 0; + for (int i = 0; i < ROW_SIZE; i++) { + red = fread(&row->text[i], 1, 1, f); + if (red != 1) return; + if (row->text[i] == '\n') { + row->text[i] = 0; + break; + } + } + row = b_insert(row); + } + fclose(f); +} + void c_save(char *file) { FILE *f = fopen(file + 2, "w"); @@ -15,3 +36,4 @@ c_save(char *file) { } } + diff --git a/c_open.c b/c_open.c deleted file mode 100644 index 82bbf40..0000000 --- a/c_open.c +++ /dev/null @@ -1,21 +0,0 @@ -void -c_open(char *file) { - FILE *f = fopen(file + 2, "r"); - if(f == NULL) { puts("couldnt open file."); return; } - b_truncate(buffer); - Row *row = buffer; - while (1) { - size_t red = 0; - for (int i = 0; i < ROW_SIZE; i++) { - red = fread(&row->text[i], 1, 1, f); - if (red != 1) return; - if (row->text[i] == '\n') { - row->text[i] = 0; - break; - } - } - row = b_insert(row); - } - fclose(f); -} - diff --git a/efn.c b/efn.c index c5335ff..570f24d 100644 --- a/efn.c +++ b/efn.c @@ -9,7 +9,8 @@ #include "main.c" #include "c_quit.c" -#include "c_open.c" + +#include "c_file.c" #include "b_truncate.c" #include "c_print.c" @@ -17,7 +18,6 @@ #include "c_writeline.c" #include "b_getline.c" -#include "c_save.c" #include "c_insertline.c" #include "c_indent.c" #include "c_delete.c" @@ -26,3 +26,4 @@ #include "commands.c" +