diff --git a/inc/ini/ini.h b/inc/ini/ini.h deleted file mode 100644 index 449d2dce0d01f9d0dc8c60f89ee2c6fece17d9ce..0000000000000000000000000000000000000000 --- a/inc/ini/ini.h +++ /dev/null @@ -1,139 +0,0 @@ -/* inih -- simple .INI file parser - SPDX-License-Identifier: BSD-3-Clause - Copyright (C) 2009-2020, Ben Hoyt */ - -#ifndef __INI_H__ -#define __INI_H__ - -/* Make this header file easier to include in C++ code */ -#ifdef __cplusplus -extern "C" { -#endif - -#include <stdio.h> - -/* Nonzero if ini_handler callback should accept lineno parameter. */ -#ifndef INI_HANDLER_LINENO -#define INI_HANDLER_LINENO 0 -#endif - -/* Typedef for prototype of handler function. */ -#if INI_HANDLER_LINENO -typedef int (*ini_handler)(void *user, const char *section, - const char *name, const char *value, - int lineno); -#else -typedef int (*ini_handler)(void *user, const char *section, - const char *name, const char *value); -#endif - -/* Typedef for prototype of fgets-style reader function. */ -typedef char *(*ini_reader)(char *str, int num, void *stream); - -/* Parse given INI-style file. May have [section]s, name=value pairs - (whitespace stripped), and comments starting with ';' (semicolon). Section - is "" if name=value pair parsed before any section heading. name:value - pairs are also supported as a concession to Python's configparser. - - For each name=value pair parsed, call handler function with given user - pointer as well as section, name, and value (data only valid for duration - of handler call). Handler should return nonzero on success, zero on error. - - Returns 0 on success, line number of first error on parse error (doesn't - stop on first error), -1 on file open error, or -2 on memory allocation - error (only when INI_USE_STACK is zero). -*/ -int ini_parse(const char *filename, ini_handler handler, void *user); - -/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't - close the file when it's finished -- the caller must do that. */ -int ini_parse_file(FILE *file, ini_handler handler, void *user); - -/* Same as ini_parse(), but takes an ini_reader function pointer instead of - filename. Used for implementing custom or string-based I/O (see also - ini_parse_string). */ -int ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, - void *user); - -/* Same as ini_parse(), but takes a zero-terminated string with the INI data -instead of a file. Useful for parsing INI data from a network socket or -already in memory. */ -int ini_parse_string(const char *string, ini_handler handler, void *user); - -/* Nonzero to allow multi-line value parsing, in the style of Python's - configparser. If allowed, ini_parse() will call the handler with the same - name for each subsequent line parsed. */ -#ifndef INI_ALLOW_MULTILINE -#define INI_ALLOW_MULTILINE 1 -#endif - -/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of - the file. See https://github.com/benhoyt/inih/issues/21 */ -#ifndef INI_ALLOW_BOM -#define INI_ALLOW_BOM 1 -#endif - -/* Chars that begin a start-of-line comment. Per Python configparser, allow - both ; and # comments at the start of a line by default. */ -#ifndef INI_START_COMMENT_PREFIXES -#define INI_START_COMMENT_PREFIXES ";#" -#endif - -/* Nonzero to allow inline comments (with valid inline comment characters - specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match - Python 3.2+ configparser behaviour. */ -#ifndef INI_ALLOW_INLINE_COMMENTS -#define INI_ALLOW_INLINE_COMMENTS 1 -#endif -#ifndef INI_INLINE_COMMENT_PREFIXES -#define INI_INLINE_COMMENT_PREFIXES ";" -#endif - -/* Nonzero to use stack for line buffer, zero to use heap (malloc/free). */ -#ifndef INI_USE_STACK -#define INI_USE_STACK 1 -#endif - -/* Maximum line length for any line in INI file (stack or heap). Note that - this must be 3 more than the longest line (due to '\r', '\n', and '\0'). */ -#ifndef INI_MAX_LINE -#define INI_MAX_LINE 200 -#endif - -/* Nonzero to allow heap line buffer to grow via realloc(), zero for a - fixed-size buffer of INI_MAX_LINE bytes. Only applies if INI_USE_STACK is - zero. */ -#ifndef INI_ALLOW_REALLOC -#define INI_ALLOW_REALLOC 0 -#endif - -/* Initial size in bytes for heap line buffer. Only applies if INI_USE_STACK - is zero. */ -#ifndef INI_INITIAL_ALLOC -#define INI_INITIAL_ALLOC 200 -#endif - -/* Stop parsing on first error (default is to keep parsing). */ -#ifndef INI_STOP_ON_FIRST_ERROR -#define INI_STOP_ON_FIRST_ERROR 0 -#endif - -/* Nonzero to call the handler at the start of each new section (with - name and value NULL). Default is to only call the handler on - each name=value pair. */ -#ifndef INI_CALL_HANDLER_ON_NEW_SECTION -#define INI_CALL_HANDLER_ON_NEW_SECTION 0 -#endif - -/* Nonzero to allow a name without a value (no '=' or ':' on the line) and - call the handler with value NULL in this case. Default is to treat - no-value lines as an error. */ -#ifndef INI_ALLOW_NO_VALUE -#define INI_ALLOW_NO_VALUE 0 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __INI_H__ */ diff --git a/inc/lektor/common.h b/inc/lektor/common.h index 64abaa2848b089c41dae60292094de547d4c9b77..75f81aba4aac524c50a0ab89b42106c6e5b723d6 100644 --- a/inc/lektor/common.h +++ b/inc/lektor/common.h @@ -7,7 +7,9 @@ /* Defines */ -#define INI_MAX_LINE_LEN 1024 +#define INI_MAX_LINE_LEN 512 +#define INI_MAX_SECTION_LEN 80 + #define URL_MAX_LEN 1024 #define DEFAULT_URL "https://kurisu.iiens.net" #define GET_ID_JSON DEFAULT_URL "/api_karas.php?id=%ld" diff --git a/meson.build b/meson.build index 3a06d3244e75a7e7d510f9cf1145b1ffa5bae427..5d3d4429352a4851cf0c34246472a178eca591f0 100644 --- a/meson.build +++ b/meson.build @@ -58,7 +58,6 @@ core_sources = [ 'src/mkv/bufferfd.c' , 'src/net/downloader.c' , 'src/config.c' , 'src/uri.c' - , 'src/ini/ini.c' , 'src/thread.c' ] diff --git a/src/config.c b/src/config.c index 30fb19a79ef052e92af0cf8948403fd9847591b7..204ffbc44b44c87baea33a9b2063663d9fae44c4 100644 --- a/src/config.c +++ b/src/config.c @@ -38,8 +38,9 @@ skip(char *s) static inline int ini_parse(const char *path, ini_handler handle, volatile sqlite3 *db) { - char line[INI_MAX_LINE_LEN], *start, *end, *name, *value; - int error = 1, linenum = 0; + char *start, *end, *name, *value; + char section[INI_MAX_SECTION_LEN], line[INI_MAX_LINE_LEN]; + int error = 0, linenum = 0, len; FILE *file = fopen(path, "r"); if (!file) { LOG_ERROR_SCT("PARSER", "Failed to open config file '%s'", path); @@ -59,21 +60,52 @@ ini_parse(const char *path, ini_handler handle, volatile sqlite3 *db) else if (start[0] == '[') { end = &start[1 + strcspn(start + 1, "]")]; if (end[0] == ']') { + end[0] = '\0'; + len = strlen(&start[1]); + len = MIN(len + 1, INI_MAX_SECTION_LEN); + memcpy(section, &start[1], len); + section[INI_MAX_SECTION_LEN - 1] = '\0'; } else { + error = 1; LOG_ERROR_SCT("PARSER", "Invalid section name at line '%d'", linenum); } } - /* Handle others */ + /* Handle name[:=]name pair */ else if (start[0]) { + end = &start[1 + strcspn(start + 1, ":=")]; + if (end[0] == '=' || end[0] == ':') { + end[0] = '\0'; + name = strip(start); + value = &end[1]; + + /* Find a comment */ + end = &value[strcspn(value, ":=")]; + if (end[0]) + end[0] = '\0'; + + /* Skip all spaces */ + value = skip(value); + strip(value); + + /* Handle the SECTION, NAME[:=]VALUE */ + if (handle(db, section, name, value)) { + error = 1; + LOG_ERROR_SCT("PARSER", "Failed to handle %s, %s[:=]%s at line '%d'", + section, name, value, linenum); + } + } + + else { + error = 1; + LOG_ERROR_SCT("PARSER", "Invalid name[:=]value pair at line '%d'", linenum); + } } } /* End of the function */ - error = 0; -error: fclose(file); if (error) LOG_ERROR_SCT("PARSER", "An error occured while parsing the file '%s'", path); @@ -111,10 +143,10 @@ load_so(const char *const mod_path, const char *const mod_init, void *mod) inline int load_module_by_name(volatile sqlite3 *db, const char *name, void *mod) { - char mod_path[PATH_MAX], mod_load[INI_MAX_LINE]; + char mod_path[PATH_MAX], mod_load[INI_MAX_LINE_LEN]; if (!database_config_get_text(db, name, "path", mod_path, PATH_MAX) || - !database_config_get_text(db, name, "load_function", mod_load, INI_MAX_LINE)) { + !database_config_get_text(db, name, "load_function", mod_load, INI_MAX_LINE_LEN)) { LOG_ERROR("Module named %s is incomplete or is not defined in config file", name); return 1; } @@ -154,8 +186,8 @@ static int handler(volatile sqlite3 *user, const char *section, const char *name, const char *value) { RETURN_UNLESS(section && name && value, "I can't complete the database with incomplete lines", 1); - RETURN_UNLESS(database_config_set(user, section, name, value), "Failed to update the database", 0); - return 1; + RETURN_UNLESS(database_config_set(user, section, name, value), "Failed to update the database", 1); + return 0; } int diff --git a/src/ini/ini.c b/src/ini/ini.c deleted file mode 100644 index 5329bcc977c980652b35607d57b2807bda516e63..0000000000000000000000000000000000000000 --- a/src/ini/ini.c +++ /dev/null @@ -1,231 +0,0 @@ -/* inih -- simple .INI file parser - SPDX-License-Identifier: BSD-3-Clause - Copyright (C) 2009-2020, Ben Hoyt */ - -#include <stdio.h> -#include <ctype.h> -#include <string.h> - -#include <ini/ini.h> - -#if !INI_USE_STACK -#include <stdlib.h> -#endif - -#define MAX_SECTION 50 -#define MAX_NAME 50 - -/* Used by ini_parse_string() to keep track of string parsing state. */ -typedef struct { - const char *ptr; - size_t num_left; -} ini_parse_string_ctx; - -/* Strip whitespace chars off end of given string, in place. Return s. */ -static char * -rstrip(char *s) -{ - char *p = s + strlen(s); - while (p > s && isspace((unsigned char)(*--p))) - *p = '\0'; - return s; -} - -/* Return pointer to first non-whitespace char in given string. */ -static char * -lskip(const char *s) -{ - while (*s && isspace((unsigned char)(*s))) - s++; - return (char *)s; -} - -/* Return pointer to first char (of chars) or inline comment in given string, - or pointer to null at end of string if neither found. Inline comment must - be prefixed by a whitespace character to register as a comment. */ -static char * -find_chars_or_comment(const char *s, const char *chars) -{ -#if INI_ALLOW_INLINE_COMMENTS - int was_space = 0; - while (*s && (!chars || !strchr(chars, *s)) && - !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) { - was_space = isspace((unsigned char)(*s)); - s++; - } -#else - while (*s && (!chars || !strchr(chars, *s))) - s++; -#endif - return (char *)s; -} - -/* Version of strncpy that ensures dest (size bytes) is null-terminated. */ -static char * -strncpy0(char *dest, const char *src, size_t size) -{ - strncpy(dest, src, size - 1); - dest[size - 1] = '\0'; - return dest; -} - -/* See documentation in header file. */ -int -ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, - void *user) -{ - /* Uses a fair bit of stack (use heap instead if you need to) */ -#if INI_USE_STACK - char line[INI_MAX_LINE]; - int max_line = INI_MAX_LINE; -#else - char *line; - size_t max_line = INI_INITIAL_ALLOC; -#endif -#if INI_ALLOW_REALLOC && !INI_USE_STACK - char *new_line; - size_t offset; -#endif - char section[MAX_SECTION] = ""; - char prev_name[MAX_NAME] = ""; - - char *start; - char *end; - char *name; - char *value; - int lineno = 0; - int error = 0; - -#if !INI_USE_STACK - line = (char *)malloc(INI_INITIAL_ALLOC); - if (!line) - return -2; -#endif - -#if INI_HANDLER_LINENO -#define HANDLER(u, s, n, v) handler(u, s, n, v, lineno) -#else -#define HANDLER(u, s, n, v) handler(u, s, n, v) -#endif - - /* Scan through stream line by line */ - while (reader(line, (int)max_line, stream) != NULL) { - lineno++; - - start = line; - start = lskip(rstrip(start)); - - if (strchr(INI_START_COMMENT_PREFIXES, *start)) { - /* Start-of-line comment */ - } - else if (*start == '[') { - /* A "[section]" line */ - end = find_chars_or_comment(start + 1, "]"); - if (*end == ']') { - *end = '\0'; - strncpy0(section, start + 1, sizeof(section)); - *prev_name = '\0'; - } else if (!error) { - /* No ']' found on section line */ - error = lineno; - } - } else if (*start) { - /* Not a comment, must be a name[=:]value pair */ - end = find_chars_or_comment(start, "=:"); - if (*end == '=' || *end == ':') { - *end = '\0'; - name = rstrip(start); - value = end + 1; -#if INI_ALLOW_INLINE_COMMENTS - end = find_chars_or_comment(value, NULL); - if (*end) - *end = '\0'; -#endif - value = lskip(value); - rstrip(value); - - /* Valid name[=:]value pair found, call handler */ - strncpy0(prev_name, name, sizeof(prev_name)); - if (!HANDLER(user, section, name, value) && !error) - error = lineno; - } else if (!error) { - /* No '=' or ':' found on name[=:]value line */ - error = lineno; - } - } - -#if INI_STOP_ON_FIRST_ERROR - if (error) - break; -#endif - } - - return error; -} - -/* See documentation in header file. */ -int -ini_parse_file(FILE *file, ini_handler handler, void *user) -{ - return ini_parse_stream((ini_reader)fgets, file, handler, user); -} - -/* See documentation in header file. */ -int -ini_parse(const char *filename, ini_handler handler, void *user) -{ - FILE *file; - int error; - - file = fopen(filename, "r"); - if (!file) { - fprintf(stderr, " ! ini_parse: Failed to open file %s\n", filename); - return -1; - } - error = ini_parse_file(file, handler, user); - fclose(file); - if (error) - fprintf(stderr, " ! ini_parse: Got an error, code is %d\n", error); - return error; -} - -/* An ini_reader function to read the next line from a string buffer. This - is the fgets() equivalent used by ini_parse_string(). */ -static char * -ini_reader_string(char *str, int num, void *stream) -{ - ini_parse_string_ctx *ctx = (ini_parse_string_ctx *)stream; - const char *ctx_ptr = ctx->ptr; - size_t ctx_num_left = ctx->num_left; - char *strp = str; - char c; - - if (ctx_num_left == 0 || num < 2) - return NULL; - - while (num > 1 && ctx_num_left != 0) { - c = *ctx_ptr++; - ctx_num_left--; - *strp++ = c; - if (c == '\n') - break; - num--; - } - - *strp = '\0'; - ctx->ptr = ctx_ptr; - ctx->num_left = ctx_num_left; - return str; -} - -/* See documentation in header file. */ -int -ini_parse_string(const char *string, ini_handler handler, void *user) -{ - ini_parse_string_ctx ctx; - - ctx.ptr = string; - ctx.num_left = strlen(string); - return ini_parse_stream((ini_reader)ini_reader_string, &ctx, handler, - user); -}