diff options
| -rw-r--r-- | buffer.cpp | 33 | ||||
| -rw-r--r-- | jet.cpp | 6 |
2 files changed, 25 insertions, 14 deletions
@@ -4,21 +4,30 @@ struct Buffer { Buffer(const char *name) : name(name), storage(new Page()) {} - void read(const char *file) { - FILE *f = fopen(file, "r"); - char c; - Point p(storage, 0); - while ((c = fgetc(f)) != EOF) { - p.push(c); + void read_file(const char *pathname) { + int file = open(pathname, O_RDONLY); + Page *iter = storage; + int bytes_read = read(file, iter->elements, PAGE_SIZE); + iter->gap_start = bytes_read; + iter->element_count = bytes_read; + while (bytes_read == PAGE_SIZE) { + iter->next = new Page(); + iter = iter->next; + bytes_read = read(file, iter->elements, PAGE_SIZE); + iter->gap_start = bytes_read; + iter->element_count = bytes_read; } - fclose(f); + close(file); } - void write(const char *file) { - FILE *f = fopen(file, "w+"); - for (Point p(storage, 0); !p.at_end(); p++) { - fputc(p.element(), f); + void write_file(const char *pathname) { + int file = open(pathname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + Page *iter = storage; + while (iter) { + write(file, iter->elements, iter->gap_start); + write(file, iter->elements + iter->gap_end, PAGE_SIZE - iter->gap_end); + iter = iter->next; } - fclose(f); + close(file); } }; @@ -3,6 +3,8 @@ #include <string.h> #include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #include <sys/socket.h> #include <netinet/ip.h> #include <arpa/inet.h> @@ -48,7 +50,7 @@ void parse_command(char *command, Client *client) { int main() { Buffer scratch("scratch"); - scratch.read("LICENSE"); + scratch.read_file("LICENSE"); int listener = create_listener(); @@ -62,7 +64,7 @@ int main() { epoll_event events[MAX_EVENTS]; Client *clients[1024] = {}; - for (;;) { + while (true) { int nfds = epoll_wait(epollfd, events, MAX_EVENTS, -1); for (int i = 0; i < nfds; i++) { |