Refactor directory structure

* Move core library sources into src/lib/core
* Move command-line programs into src/cli

1 files changed, 0 insertions, 678 deletions

diff --git a/src/ini.c b/src/ini.c
deleted file mode 100644
index d44e1cc..0000000
--- a/src/ini.c
+++ /dev/null
@@ -1,678 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "core.h"
-#include "ini.h"
-
-struct INIFILE *ini_init() {
-    struct INIFILE *ini;
-    ini = calloc(1, sizeof(*ini));
-    ini->section_count = 0;
-    return ini;
-}
-
-void ini_section_init(struct INIFILE **ini) {
-    (*ini)->section = calloc((*ini)->section_count + 1, sizeof(**(*ini)->section));
-}
-
-struct INISection *ini_section_search(struct INIFILE **ini, unsigned mode, const char *value) {
-    struct INISection *result = NULL;
-    for (size_t i = 0; i < (*ini)->section_count; i++) {
-        if ((*ini)->section[i]->key != NULL) {
-            if (mode == INI_SEARCH_EXACT) {
-                if (!strcmp((*ini)->section[i]->key, value)) {
-                    result = (*ini)->section[i];
-                    break;
-                }
-            } else if (mode == INI_SEARCH_BEGINS) {
-                if (startswith((*ini)->section[i]->key, value)) {
-                    result = (*ini)->section[i];
-                    break;
-                }
-            } else if (mode == INI_SEARCH_SUBSTR) {
-                if (strstr((*ini)->section[i]->key, value)) {
-                    result = (*ini)->section[i];
-                    break;
-                }
-            }
-        }
-    }
-    return result;
-}
-
-int ini_data_init(struct INIFILE **ini, char *section_name) {
-    struct INISection *section = ini_section_search(ini, INI_SEARCH_EXACT, section_name);
-    if (section == NULL) {
-        return 1;
-    }
-    section->data = calloc(section->data_count + 1, sizeof(**section->data));
-    return 0;
-}
-
-int ini_has_key(struct INIFILE *ini, const char *section_name, const char *key) {
-    if (!ini || !section_name || !key) {
-        return 0;
-    }
-    struct INISection *section = ini_section_search(&ini, INI_SEARCH_EXACT, section_name);
-    if (!section) {
-        return 0;
-    }
-    for (size_t i = 0; i < section->data_count; i++) {
-        const struct INIData *data = section->data[i];
-        if (data && data->key) {
-            if (!strcmp(data->key, key)) {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-struct INIData *ini_data_get(struct INIFILE *ini, char *section_name, char *key) {
-    struct INISection *section = NULL;
-
-    section = ini_section_search(&ini, INI_SEARCH_EXACT, section_name);
-    if (!section) {
-        return NULL;
-    }
-
-    for (size_t i = 0; i < section->data_count; i++) {
-        if (section->data[i]->key != NULL) {
-            if (!strcmp(section->data[i]->key, key)) {
-                return section->data[i];
-            }
-        }
-    }
-
-    return NULL;
-}
-
-struct INIData *ini_getall(struct INIFILE *ini, char *section_name) {
-    struct INISection *section = NULL;
-    struct INIData *result = NULL;
-    static size_t i = 0;
-
-    section = ini_section_search(&ini, INI_SEARCH_EXACT, section_name);
-    if (!section) {
-        return NULL;
-    }
-    if (i == section->data_count) {
-        i = 0;
-        return NULL;
-    }
-    if (section->data_count) {
-        result = section->data[i];
-        i++;
-    } else {
-        result = NULL;
-        i = 0;
-    }
-
-    return result;
-}
-
-int ini_getval(struct INIFILE *ini, char *section_name, char *key, int type, int flags, union INIVal *result) {
-    char *token = NULL;
-    char tbuf[STASIS_BUFSIZ];
-    char *tbufp = tbuf;
-    struct INIData *data;
-    data = ini_data_get(ini, section_name, key);
-    if (!data) {
-        result->as_char_p = NULL;
-        return -1;
-    }
-
-    char *data_copy = strdup(data->value);
-    if (flags == INI_READ_RENDER) {
-        char *render = tpl_render(data_copy);
-        if (render && strcmp(render, data_copy) != 0) {
-            guard_free(data_copy);
-            data_copy = render;
-        } else {
-            guard_free(render);
-        }
-    }
-    lstrip(data_copy);
-
-    switch (type) {
-        case INIVAL_TYPE_CHAR:
-            result->as_char = (char) strtol(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_UCHAR:
-            result->as_uchar = (unsigned char) strtoul(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_SHORT:
-            result->as_short = (short) strtol(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_USHORT:
-            result->as_ushort = (unsigned short) strtoul(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_INT:
-            result->as_int = (int) strtol(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_UINT:
-            result->as_uint = (unsigned int) strtoul(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_LONG:
-            result->as_long = (long) strtol(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_ULONG:
-            result->as_ulong = (unsigned long) strtoul(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_LLONG:
-            result->as_llong = (long long) strtoll(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_ULLONG:
-            result->as_ullong = (unsigned long long) strtoull(data_copy, NULL, 10);
-            break;
-        case INIVAL_TYPE_DOUBLE:
-            result->as_double = (double) strtod(data_copy, NULL);
-            break;
-        case INIVAL_TYPE_FLOAT:
-            result->as_float = strtof(data_copy, NULL);
-            break;
-        case INIVAL_TYPE_STR:
-            result->as_char_p = strdup(data_copy);
-            if (!result->as_char_p) {
-                return -1;
-            }
-            break;
-        case INIVAL_TYPE_STR_ARRAY:
-            strcpy(tbufp, data_copy);
-            guard_free(data_copy);
-            data_copy = calloc(STASIS_BUFSIZ, sizeof(*data_copy));
-            if (!data_copy) {
-                return -1;
-            }
-            while ((token = strsep(&tbufp, "\n")) != NULL) {
-                //lstrip(token);
-                if (!isempty(token)) {
-                    strcat(data_copy, token);
-                    strcat(data_copy, "\n");
-                }
-            }
-            strip(data_copy);
-            result->as_char_p = strdup(data_copy);
-            break;
-        case INIVAL_TYPE_BOOL:
-            result->as_bool = false;
-            if ((!strcmp(data_copy, "true") || !strcmp(data_copy, "True")) ||
-                    (!strcmp(data_copy, "yes") || !strcmp(data_copy, "Yes")) ||
-                    strtol(data_copy, NULL, 10)) {
-                result->as_bool = true;
-            }
-            break;
-        default:
-            memset(result, 0, sizeof(*result));
-            break;
-    }
-    guard_free(data_copy);
-    return 0;
-}
-
-#define getval_returns(t) return result.t
-#define getval_setup(t, f) \
-    union INIVal result; \
-    int state_local = 0; \
-    state_local = ini_getval(ini, section_name, key, t, f, &result); \
-    if (state != NULL) { \
-        *state = state_local; \
-    }
-
-int ini_getval_int(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_INT, flags)
-    getval_returns(as_int);
-}
-
-unsigned int ini_getval_uint(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_UINT, flags)
-    getval_returns(as_uint);
-}
-
-long ini_getval_long(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_LONG, flags)
-    getval_returns(as_long);
-}
-
-unsigned long ini_getval_ulong(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_ULONG, flags)
-    getval_returns(as_ulong);
-}
-
-long long ini_getval_llong(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_LLONG, flags)
-    getval_returns(as_llong);
-}
-
-unsigned long long ini_getval_ullong(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_ULLONG, flags)
-    getval_returns(as_ullong);
-}
-
-float ini_getval_float(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_FLOAT, flags)
-    getval_returns(as_float);
-}
-
-double ini_getval_double(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_DOUBLE, flags)
-    getval_returns(as_double);
-}
-
-bool ini_getval_bool(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_BOOL, flags)
-    getval_returns(as_bool);
-}
-
-short ini_getval_short(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_SHORT, flags)
-    getval_returns(as_short);
-}
-
-unsigned short ini_getval_ushort(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_USHORT, flags)
-    getval_returns(as_ushort);
-}
-
-char ini_getval_char(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_CHAR, flags)
-    getval_returns(as_char);
-}
-
-unsigned char ini_getval_uchar(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_UCHAR, flags)
-    getval_returns(as_uchar);
-}
-
-char *ini_getval_char_p(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_STR, flags)
-    getval_returns(as_char_p);
-}
-
-char *ini_getval_str(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    return ini_getval_char_p(ini, section_name, key, flags, state);
-}
-
-char *ini_getval_char_array_p(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_STR_ARRAY, flags)
-    getval_returns(as_char_p);
-}
-
-char *ini_getval_str_array(struct INIFILE *ini, char *section_name, char *key, int flags, int *state) {
-    return ini_getval_char_array_p(ini, section_name, key, flags, state);
-}
-
-struct StrList *ini_getval_strlist(struct INIFILE *ini, char *section_name, char *key, char *tok, int flags, int *state) {
-    getval_setup(INIVAL_TYPE_STR_ARRAY, flags)
-    struct StrList *list;
-    list = strlist_init();
-    strlist_append_tokenize(list, result.as_char_p, tok);
-    guard_free(result.as_char_p);
-    return list;
-}
-
-int ini_data_append(struct INIFILE **ini, char *section_name, char *key, char *value, unsigned int hint) {
-    struct INISection *section = ini_section_search(ini, INI_SEARCH_EXACT, section_name);
-    if (section == NULL) {
-        return 1;
-    }
-
-    struct INIData **tmp = realloc(section->data, (section->data_count + 1) * sizeof(**section->data));
-    if (tmp == NULL) {
-        return 1;
-    } else {
-        section->data = tmp;
-    }
-    if (!ini_data_get((*ini), section_name, key)) {
-        struct INIData **data = section->data;
-        data[section->data_count] = calloc(1, sizeof(*data[0]));
-        if (!data[section->data_count]) {
-            SYSERROR("Unable to allocate %zu bytes for section data", sizeof(*data[0]));
-            return -1;
-        }
-        data[section->data_count]->type_hint = hint;
-        data[section->data_count]->key = key ? strdup(key) : strdup("");
-        if (!data[section->data_count]->key) {
-            SYSERROR("Unable to allocate data key%s", "");
-            return -1;
-        }
-        data[section->data_count]->value = strdup(value);
-        if (!data[section->data_count]->value) {
-            SYSERROR("Unable to allocate data value%s", "");
-            return -1;
-        }
-        section->data_count++;
-    } else {
-        struct INIData *data = ini_data_get(*ini, section_name, key);
-        size_t value_len_old = strlen(data->value);
-        size_t value_len = strlen(value);
-        size_t value_len_new = value_len_old + value_len;
-        char *value_tmp = NULL;
-        value_tmp = realloc(data->value, value_len_new + 2);
-        if (!value_tmp) {
-            SYSERROR("Unable to increase data->value size to %zu bytes", value_len_new + 2);
-            return -1;
-        } else {
-            data->value = value_tmp;
-        }
-        strcat(data->value, value);
-    }
-    return 0;
-}
-
-int ini_setval(struct INIFILE **ini, unsigned type, char *section_name, char *key, char *value) {
-    struct INISection *section = ini_section_search(ini, INI_SEARCH_EXACT, section_name);
-    if (section == NULL) {
-        // no section
-        return -1;
-    }
-    if (ini_has_key(*ini, section_name, key)) {
-        if (!type) {
-            if (ini_data_append(ini, section_name, key, value, 0)) {
-                // append failed
-                return -1;
-            }
-        } else {
-            struct INIData *data = ini_data_get(*ini, section_name, key);
-            if (data) {
-                guard_free(data->value);
-                data->value = strdup(value);
-                if (!data->value) {
-                    // allocation failed
-                    return -1;
-                }
-            } else {
-                // getting data failed
-                return -1;
-            }
-        }
-    }
-    return 0;
-}
-
-int ini_section_create(struct INIFILE **ini, char *key) {
-    struct INISection **tmp = realloc((*ini)->section, ((*ini)->section_count + 1) * sizeof(**(*ini)->section));
-    if (tmp == NULL) {
-        return 1;
-    } else {
-        (*ini)->section = tmp;
-    }
-
-    (*ini)->section[(*ini)->section_count] = calloc(1, sizeof(*(*ini)->section[0]));
-    if (!(*ini)->section[(*ini)->section_count]) {
-        return -1;
-    }
-
-    (*ini)->section[(*ini)->section_count]->key = strdup(key);
-    if (!(*ini)->section[(*ini)->section_count]->key) {
-        return -1;
-    }
-
-    (*ini)->section_count++;
-    return 0;
-}
-
-int ini_write(struct INIFILE *ini, FILE **stream, unsigned mode) {
-    if (!*stream) {
-        return -1;
-    }
-    for (size_t x = 0; x < ini->section_count; x++) {
-        struct INISection *section = ini->section[x];
-        char *section_name = section->key;
-        fprintf(*stream, "[%s]" LINE_SEP, section_name);
-
-        for (size_t y = 0; y < ini->section[x]->data_count; y++) {
-            struct INIData *data = section->data[y];
-            char outvalue[STASIS_BUFSIZ];
-            char *key = data->key;
-            char *value = data->value;
-            unsigned *hint = &data->type_hint;
-            memset(outvalue, 0, sizeof(outvalue));
-
-            if (key && value) {
-                int err = 0;
-                char *xvalue = NULL;
-                if (*hint == INIVAL_TYPE_STR_ARRAY) {
-                    xvalue = ini_getval_str_array(ini, section_name, key, (int) mode, &err);
-                    value = xvalue;
-                } else {
-                    xvalue = ini_getval_str(ini, section_name, key, (int) mode, &err);
-                    value = xvalue;
-                }
-                char **parts = split(value, LINE_SEP, 0);
-                size_t parts_total = 0;
-                for (; parts && parts[parts_total] != NULL; parts_total++);
-                for (size_t p = 0; parts && parts[p] != NULL; p++) {
-                    char *render = NULL;
-                    if (mode == INI_WRITE_PRESERVE) {
-                        render = tpl_render(parts[p]);
-                    } else {
-                        render = parts[p];
-                    }
-
-                    if (!render) {
-                        SYSERROR("%s", "rendered string value can never be NULL!\n");
-                        return -1;
-                    }
-
-                    if (*hint == INIVAL_TYPE_STR_ARRAY) {
-                        int leading_space = isspace(*render);
-                        if (leading_space) {
-                            sprintf(outvalue + strlen(outvalue), "%s" LINE_SEP, render);
-                        } else {
-                            sprintf(outvalue + strlen(outvalue), "    %s" LINE_SEP, render);
-                        }
-                    } else {
-                        sprintf(outvalue + strlen(outvalue), "%s", render);
-                    }
-                    if (mode == INI_WRITE_PRESERVE) {
-                        guard_free(render);
-                    }
-                }
-                GENERIC_ARRAY_FREE(parts);
-                strip(outvalue);
-                strcat(outvalue, LINE_SEP);
-                fprintf(*stream, "%s = %s%s", ini->section[x]->data[y]->key, *hint == INIVAL_TYPE_STR_ARRAY ? LINE_SEP : "", outvalue);
-                guard_free(value);
-            } else {
-                fprintf(*stream, "%s = %s", ini->section[x]->data[y]->key, ini->section[x]->data[y]->value);
-            }
-        }
-        fprintf(*stream, LINE_SEP);
-    }
-    return 0;
-}
-
-char *unquote(char *s) {
-    if ((startswith(s, "'") && endswith(s, "'"))
-        || (startswith(s, "\"") && endswith(s, "\""))) {
-        memmove(s, s + 1, strlen(s));
-        s[strlen(s) - 1] = '\0';
-    }
-    return s;
-}
-
-void ini_free(struct INIFILE **ini) {
-    for (size_t section = 0; section < (*ini)->section_count; section++) {
-#ifdef DEBUG
-        SYSERROR("freeing section: %s", (*ini)->section[section]->key);
-#endif
-        for (size_t data = 0; data < (*ini)->section[section]->data_count; data++) {
-            if ((*ini)->section[section]->data[data]) {
-#ifdef DEBUG
-                SYSERROR("freeing data key: %s", (*ini)->section[section]->data[data]->key);
-#endif
-                guard_free((*ini)->section[section]->data[data]->key);
-#ifdef DEBUG
-                SYSERROR("freeing data value: %s", (*ini)->section[section]->data[data]->value);
-#endif
-                guard_free((*ini)->section[section]->data[data]->value);
-                guard_free((*ini)->section[section]->data[data]);
-            }
-        }
-        guard_free((*ini)->section[section]->data);
-        guard_free((*ini)->section[section]->key);
-        guard_free((*ini)->section[section]);
-    }
-    guard_free((*ini)->section);
-    guard_free((*ini));
-}
-
-struct INIFILE *ini_open(const char *filename) {
-    FILE *fp;
-    char line[STASIS_BUFSIZ] = {0};
-    char current_section[STASIS_BUFSIZ] = {0};
-    char reading_value = 0;
-
-    struct INIFILE *ini = ini_init();
-    if (ini == NULL) {
-        return NULL;
-    }
-
-    ini_section_init(&ini);
-
-    // Create an implicit section. [default] does not need to be present in the INI config
-    ini_section_create(&ini, "default");
-    strcpy(current_section, "default");
-
-    // Open the configuration file for reading
-    fp = fopen(filename, "r");
-    if (!fp) {
-        ini_free(&ini);
-        ini = NULL;
-        return NULL;
-    }
-
-    unsigned hint = 0;
-    int multiline_data = 0;
-    int no_data = 0;
-    char inikey[2][255];
-    char *key = inikey[0];
-    char *key_last = inikey[1];
-    char value[STASIS_BUFSIZ];
-
-    memset(value, 0, sizeof(value));
-    memset(inikey, 0, sizeof(inikey));
-
-    // Read file
-    for (size_t i = 0; fgets(line, sizeof(line), fp) != NULL; i++) {
-        if (no_data && multiline_data) {
-            if (!isempty(line)) {
-                no_data = 0;
-            } else {
-                multiline_data = 0;
-            }
-            memset(value, 0, sizeof(value));
-        } else {
-            memset(key, 0, sizeof(inikey[0]));
-        }
-        // Find pointer to first comment character
-        char *comment = strpbrk(line, ";#");
-        if (comment) {
-            if (!reading_value || line - comment == 0) {
-                // Remove comment from line (standalone and inline comments)
-                if (!((comment - line > 0 && (*(comment - 1) == '\\')) || (*comment - 1) == '#')) {
-                    *comment = '\0';
-                } else {
-                    // Handle escaped comment characters. Remove the escape character '\'
-                    memmove(comment - 1, comment, strlen(comment));
-                    if (strlen(comment)) {
-                        comment[strlen(comment) - 1] = '\0';
-                    } else {
-                        comment[0] = '\0';
-                    }
-                }
-            }
-        }
-
-        // Test for section header: [string]
-        if (startswith(line, "[")) {
-            // The previous key is irrelevant now
-            memset(key_last, 0, sizeof(inikey[1]));
-
-            char *section_name = substring_between(line, "[]");
-            if (!section_name) {
-                fprintf(stderr, "error: invalid section syntax, line %zu: '%s'\n", i + 1, line);
-                return NULL;
-            }
-
-            // Ignore default section because we already have an implicit one
-            if (!strncmp(section_name, "default", strlen("default"))) {
-                guard_free(section_name);
-                continue;
-            }
-
-            // Create new named section
-            strip(section_name);
-            ini_section_create(&ini, section_name);
-
-            // Record the name of the section. This is used until another section is found.
-            memset(current_section, 0, sizeof(current_section));
-            strcpy(current_section, section_name);
-            guard_free(section_name);
-            memset(line, 0, sizeof(line));
-            continue;
-        }
-
-        // no data, skip
-        if (!reading_value && isempty(line)) {
-            continue;
-        }
-
-        char *operator = strchr(line, '=');
-
-        // a value continuation line
-        if (multiline_data && (startswith(line, " ") || startswith(line, "\t"))) {
-            operator = NULL;
-        }
-
-        if (operator) {
-            size_t key_len = operator - line;
-            memset(key, 0, sizeof(inikey[0]));
-            strncpy(key, line, key_len);
-            lstrip(key);
-            strip(key);
-            memset(key_last, 0, sizeof(inikey[1]));
-            strcpy(key_last, key);
-            reading_value = 1;
-            if (strlen(operator) > 1) {
-                strcpy(value, &operator[1]);
-            } else {
-                strcpy(value, "");
-            }
-            if (isempty(value)) {
-                //printf("%s is probably long raw data\n", key);
-                hint = INIVAL_TYPE_STR_ARRAY;
-                multiline_data = 1;
-                no_data = 1;
-            } else {
-                //printf("%s is probably short data\n", key);
-                hint = INIVAL_TYPE_STR;
-                multiline_data = 0;
-            }
-            strip(value);
-        } else {
-            strcpy(key, key_last);
-            strcpy(value, line);
-        }
-        memset(line, 0, sizeof(line));
-
-        // Store key value pair in section's data array
-        if (strlen(key)) {
-            lstrip(key);
-            strip(key);
-            unquote(value);
-            if (!multiline_data) {
-                reading_value = 0;
-                ini_data_append(&ini, current_section, key, value, hint);
-                continue;
-            }
-            ini_data_append(&ini, current_section, key, value, hint);
-            reading_value = 1;
-        }
-    }
-    fclose(fp);
-
-    return ini;
-}
\ No newline at end of file