From e7ecffa65aee4324f1285d05abc10f1b34e0eaae Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:36:07 +0000 Subject: [PATCH] added loading files --- final/binary | Bin 21920 -> 22200 bytes final/dynstr.c | 33 +++++++ final/dynstr.h | 5 ++ final/editor.c | 9 +- final/editor.h | 2 +- final/log.txt | 20 +---- final/main.c | 22 ++++- final/somefile.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 283 insertions(+), 29 deletions(-) create mode 100644 final/somefile.c diff --git a/final/binary b/final/binary index 72a77337f1c1236f9790a8a4c27feec797d2856e..5e3ea934adba431df1964f9a7df67b13778defeb 100755 GIT binary patch delta 5506 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 delta 4564 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 VePic~=1*`&t4n+e<1fz6_#Y!F==}fy diff --git a/final/dynstr.c b/final/dynstr.c index 1823e5c..a40767c 100644 --- a/final/dynstr.c +++ b/final/dynstr.c @@ -44,10 +44,13 @@ String_t str_from_slice(const char* string, int len) { return s; } + String_t str_new() { return str_with_capacity(1); } + + int str_dealloc(String_t* self) { free(self->data); return 0; @@ -70,6 +73,36 @@ int str_push(String_t* self, char c) { return 0; } +int str_push_str(String_t* self, char* c) { + if (self->size + strlen(c) >= self->capacity) { + self->capacity = ( self->size + strlen(c) ) * sizeof(char); + self->data = (char*)realloc(self->data, self->capacity); + + for (int i = 0; i < strlen(c); i++) { + self->data[self->size + i] = c[i]; + } + self->size = self->capacity; + } +} + +String_t str_from_file(FILE* file) { + if (file == NULL) { + return str_new(); + } + + char buffer[64]; + + String_t string = str_new(); + + while (fgets(buffer, sizeof(buffer), file) != NULL) { + str_push_str(&string, buffer); + } + + fclose(file); + + return string; +} + char str_pop(String_t* self) { if (self->size == 0) { return '\0'; diff --git a/final/dynstr.h b/final/dynstr.h index 6f86e5b..563f1e5 100644 --- a/final/dynstr.h +++ b/final/dynstr.h @@ -1,5 +1,6 @@ #ifndef DYNSTR_H #define DYNSTR_H +#include typedef struct { int size; @@ -13,6 +14,10 @@ String_t str_from_chars(char* string); String_t str_from_slice(char* string, int len); +String_t str_from_file(FILE* file); + +int str_push_str(String_t* string, char* other); + String_t str_new(); String_t* str_lines(String_t* self, int* numlines); diff --git a/final/editor.c b/final/editor.c index 5f782d7..f15d9c6 100644 --- a/final/editor.c +++ b/final/editor.c @@ -11,7 +11,7 @@ typedef struct { String_t* buffer; } Editor; -Editor editor_from(char* input_string) { +Editor editor_from(String_t input_string) { Editor e; e.lines = 0; e.screen_line = 0; @@ -19,10 +19,9 @@ Editor editor_from(char* input_string) { e.editmode = false; int linenum = 0; - String_t lines = str_from_chars(input_string); - e.buffer = str_lines(&lines, &linenum); + e.buffer = str_lines(&input_string, &linenum); e.lines = (size_t)linenum; - str_dealloc(&lines); + str_dealloc(&input_string); for (size_t i = 0; i < e.lines; i++) { // adding the line number @@ -38,7 +37,7 @@ Editor editor_from(char* input_string) { } Editor new_editor() { - return editor_from(""); + return editor_from(str_new()); } void move_cursor(Editor* self, int x, int y) { diff --git a/final/editor.h b/final/editor.h index fadee90..29c6124 100644 --- a/final/editor.h +++ b/final/editor.h @@ -11,7 +11,7 @@ typedef struct { Editor new_editor(); -Editor editor_from(char* input_string); +Editor editor_from(String_t input_string); void move_cursor(Editor* self, int x, int y); void delchar(Editor* self); diff --git a/final/log.txt b/final/log.txt index ca0ed9d..ac7fb7d 100644 --- a/final/log.txt +++ b/final/log.txt @@ -1,19 +1 @@ -buffer full -size: 25 -size: 23 -size: 25 -size: 0 -ok!buffer full -size: 25 -size: 23 -size: 30 -size: 4 -size: 0 -ok!buffer full -size: 25 -size: 23 -size: 30 -size: 4 -size: 1 -size: 0 -ok! \ No newline at end of file +starting editor openiing file somefile.c \ No newline at end of file diff --git a/final/main.c b/final/main.c index 2894162..dfd730f 100644 --- a/final/main.c +++ b/final/main.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "editor.h" void help() { @@ -14,7 +15,7 @@ void help() { printf(" cmd log // prints a list of all changes made to the file\n"); } -int open_editor() { +int open_editor(char* filename) { initscr(); raw(); noecho(); @@ -22,9 +23,14 @@ int open_editor() { int max_y, max_x; getmaxyx(stdscr, max_y, max_x); - Editor editor = editor_from("this is some text to edit\nthis is the second line\nand this is the third lol"); move(0, 5); + Editor editor; + if (strcmp(filename, "") == 0) { + editor = new_editor(); + } else { + editor = editor_from(str_from_file(fopen(filename, "r"))); + } while (true) { refresh(); int c = getch(); @@ -79,8 +85,16 @@ int open_editor() { } } -int main() { - open_editor(); +int main(int argc, char* argv[]) { + if (argc == 1) { + Editor e = new_editor(); + open_editor(""); + } else if (argc == 3) { + if (strcmp(argv[1], "open") == 0) { + fprintf(stderr, "starting editor openiing file %s", argv[2]); + open_editor(argv[2]); + } + } return 0; } diff --git a/final/somefile.c b/final/somefile.c new file mode 100644 index 0000000..745908c --- /dev/null +++ b/final/somefile.c @@ -0,0 +1,221 @@ +/// dynamic array class +/// written by: Harry Irving + +#include +#include +#include +#include +#include + +typedef struct { + uint32_t size, capacity; + char* data; +} String_t; + +String_t str_with_capacity(int capacity) { + String_t s; + + /// allocate memory for 'capacity' chars + s.data = (char*)calloc(capacity, sizeof(char)); + + s.size = 0; + s.capacity = capacity; + + return s; +} + +String_t str_from_chars(const char* string) { + String_t s; + + s.data = (char*)calloc(strlen(string), sizeof(char)); + strcpy(s.data, string); + s.size = strlen(string); + s.capacity = strlen(string); + return s; +} + +String_t str_from_slice(const char* string, int len) { + String_t s; + + s.data = (char*)calloc(len, sizeof(char)); + strncpy(s.data, string, len); + s.size = len; + s.capacity = len; + return s; +} + + +String_t str_new() { + return str_with_capacity(1); +} + + + +int str_dealloc(String_t* self) { + free(self->data); + return 0; +} + +int str_push(String_t* self, char c) { + // check size < capacity + if (self->size < self->capacity) { + self->data[self->size] = c; + self->size++; + return 0; + } + + // reallocate to add capacity for an extra char + int newcap = self->capacity + sizeof(char); + self->data = (char*)realloc(self->data, newcap); + self->data[self->size] = c; + self->size++; + self->capacity = newcap; + return 0; +} + +int str_push_str(String_t* self, char* c) { + if (self->size + strlen(c) >= self->capacity) { + self->capacity = ( self->size + strlen(c) ) * sizeof(char); + self->data = (char*)realloc(self->data, self->capacity); + + for (int i = 0; i < strlen(c); i++) { + self->data[self->size + i] = c[i]; + } + self->size = self->capacity; + } +} + +String_t str_from_file(FILE* file) { + if (file == NULL) { + return str_new(); + } + + char buffer[1024]; + + String_t string = str_new(); + + while (fgets(buffer, sizeof(buffer), file) != NULL) { + str_push_str(&string, buffer); + } + + fclose(file); + + return string; +} + +char str_pop(String_t* self) { + if (self->size == 0) { + return '\0'; + } + self->size--; + char c = self->data[self->size]; + return c; +} + +int str_insert(String_t* self, int index, char c) { + if (index > self->size) { + return -1; + } + self->size++; + for (int i = self->size - 1; i > index; i--) { + self->data[i] = self->data[i - 1]; + } + self->data[index] = c; + return 0; +} + +int str_remove(String_t* self, int index) { + if (index >= self->size) { + return -1; + } + self->size--; + for (int i = index; i < self->size; i++) { + self->data[i] = self->data[i + 1]; + } + return 0; +} + +/// splits a string into an array of strings based on a delimiter +String_t* str_split(String_t* self, int* res_len, char c) { + + char* string = self->data; + String_t* elements = NULL; + + // find the number of lines in the file + + bool flag = false; + *res_len = 0; + for (int i = 0; i < strlen(string); i++) { + if (string[i] == c) { + if (flag) { + (*res_len)++; + flag = false; + } + } else { + flag = true; + } + } + if (flag) { + (*res_len)++; + } + + // allocate memory for an array of pointers to each line + elements = (String_t*)malloc((*res_len) * sizeof(String_t)); + + int i = 0; + flag = false; + char* start = string; + char* end = string; + + while (*end != '\0') { + if (*end == c) { + if (flag) { + elements[i] = str_from_slice(start, end - start); + i++; + } + end++; + start = end; + flag = false; + } else { + end++; + flag = true; + } + } if (flag) { + elements[i] = str_from_slice(start, end - start); + } + + + // returns an array of String_t + return elements; +} + +String_t* str_lines(String_t* self, int* numlines) { + return str_split(self, numlines, '\n'); +} + +int str_len(String_t* s) { + return s->size; +} + +char* to_chars(String_t* s) { + return s->data; +} + +// int main() { +// String_t s = str_from_chars("hello\nworld\neeeee\notherline\n"); + +// str_remove(&s, 10); +// str_insert(&s, 10, 'h'); + +// printf("%s\n", to_chars(&s)); + +// int linen = 0; +// String_t* lines = str_lines(&s, &linen); +// for (int i=0; i < linen; i++) { +// printf("%s", to_chars(&lines[i])); +// } + +// str_dealloc(&s); + +// return 0; +// }