diff options
Diffstat (limited to '')
| -rw-r--r-- | src/mds-kbdc/mds-kbdc.c | 218 |
1 files changed, 10 insertions, 208 deletions
diff --git a/src/mds-kbdc/mds-kbdc.c b/src/mds-kbdc/mds-kbdc.c index 27c9cca..45a0f88 100644 --- a/src/mds-kbdc/mds-kbdc.c +++ b/src/mds-kbdc/mds-kbdc.c @@ -17,180 +17,14 @@ */ #include "mds-kbdc.h" +#include "globals.h" +#include "raw-data.h" + #include <libmdsserver/macros.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> -#include <unistd.h> #include <stdio.h> -#include <string.h> - - - -/** - * The number of elements in `argv` - */ -static int argc; - -/** - * The command line arguments - */ -static char** argv; - - - -/** - * Read the content of a file, ignoring interruptions - * - * @param pathname The file to read - * @param size Output parameter for the size of the read content, in char:s - * @return The read content, `NULL` on error - */ -static char* read_file(const char* restrict pathname, size_t* restrict size) -{ - size_t buf_size = 8096; - size_t buf_ptr = 0; - char* restrict content = NULL; - char* restrict old = NULL; - int fd = -1; - ssize_t got; - - /* Allocate buffer for the file's content. */ - fail_if (xmalloc(content, buf_size, char)); - /* Open the file to compile. */ - fail_if ((fd = open(pathname, O_RDONLY)) < 0); - - /* Read the file to compile. */ - for (;;) - { - /* Make sure the buffer is not small. */ - if (buf_size - buf_ptr < 2048) - { - fail_if (xxrealloc(old, content, buf_size <<= 1, char)); - } - /* Read a chunk of the file. */ - got = read(fd, content + buf_ptr, (buf_size - buf_ptr) * sizeof(char)); - if ((got < 0) && (errno == EINTR)) continue; - else if (got < 0) goto pfail; - else if (got == 0) break; - buf_ptr += (size_t)got; - } - - /* Shrink the buffer so it is not excessively large. */ - fail_if (xxrealloc(old, content, buf_ptr, char)); - - /* Close file decriptor for the file. */ - close(fd); - - *size = buf_ptr; - return content; - - pfail: - xperror(*argv); - free(old); - free(content); - if (fd >= 0) - close(fd); - return NULL; -} - +#include <errno.h> -/** - * Remove comments from the content - * - * @param content The code to shrink - * @param size The size of `content`, in char:s - * @return The new size of `content`, in char:s; this function cannot fail - */ -static size_t remove_comments(char* restrict content, size_t size) -{ -#define t content[n_ptr++] = c - - size_t n_ptr = 0, o_ptr = 0; - int comment = 0, quote = 0, escape = 0; - - while (o_ptr < size) - { - char c = content[o_ptr++]; - /* Remove comment */ - if (comment) - { - if (c == '\n') t, comment = 0; - } - /* Quotes can contain comment symbols, quotes by also contain escapes. */ - else if (escape) t, escape = 0; - else if (quote) - { - t; - if (c == '\\') escape = 1; - else if (c == '"') quote = 0; - } - /* # is the comment symbol. */ - else if (c == '#') comment = 1; - /* " is the quote symbol. */ - else if (c == '"') t, quote = 1; - /* Code and whitespace. */ - else t; - } - - return n_ptr; - -#undef t -} - - -/** - * Create an array of each line in a text - * - * @param content The text to split, it must end with an LF. - * LF:s are treated as line endings rather than - * new lines, this means that the final LF will - * not create a new line in the returned array. - * Each LF will be replaced by a NUL-character. - * @param length The length of `content`. - * @return An array of each line in `content`. This - * array will be `NULL`-terminated. It will also - * reuse the allocate of `content`. This means - * that each element must not be free:d, rather - * you should simply free this returned allocation - * and the allocation of `content`. On error - * `NULL` is returned, and `content` will not - * have been modified. - */ -static char** line_split(char* content, size_t length) -{ - char** restrict lines = NULL; - size_t count = 0; - size_t i, j; - int new_line = 1; - - for (i = 0; i < length; i++) - if (content[i] == '\n') - count++; - - fail_if (xmalloc(lines, count + 1, char)); - lines[count] = NULL; - - for (i = j = 0; i < length; i++) - { - if (new_line) - new_line = 0, lines[j++] = content + i; - if (content[i] == '\n') - { - new_line = 1; - content[i] = '\0'; - } - } - - return lines; - - pfail: - xperror(*argv); - return NULL; -} /** @@ -203,51 +37,19 @@ static char** line_split(char* content, size_t length) int main(int argc_, char** argv_) { const char* pathname = argv_[1]; - char* content = NULL; - char* real_content = NULL; - char* old = NULL; - size_t content_size; - size_t real_content_size; - char** lines = NULL; - char** real_lines = NULL; - int rc = 0; + source_code_t source_code; argc = argc_; argv = argv_; - /* Read the file. */ - content = read_file(pathname, &content_size); - fail_if (content == NULL); - - /* Make sure the content ends with a new line. */ - if (!content_size || (content[content_size - 1] != '\n')) - { - fail_if (xxrealloc(old, content, content_size + 1, char)); - content[content_size++] = '\n'; - } - - /* Simplify file. */ - fail_if (xmalloc(real_content, content_size, char)); - memcpy(real_content, content, content_size * sizeof(char)); - real_content_size = content_size; - content_size = remove_comments(content, content_size); - fail_if (xxrealloc(old, content, content_size, char)); - - /* Split by line. */ - fail_if ((lines = line_split(content, content_size)) == NULL); - fail_if ((real_lines = line_split(real_content, real_content_size)) == NULL); + source_code_initialise(&source_code); + fail_if (read_source_lines(pathname, &source_code) < 0); - done: - free(old); - free(content); - free(real_content); - free(lines); - free(real_lines); - return rc; + return 0; pfail: xperror(*argv); - rc = 1; - goto done; + source_code_destroy(&source_code); + return 1; } |