X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6f0d21388eeeb33893728d92dfc0f3a3a6d6aafe..348e7d134e9243fd72cf8fbe366c77c1571faec1:/onak-conf.c?ds=inline diff --git a/onak-conf.c b/onak-conf.c index 81d7bdf..70990f8 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -17,6 +17,8 @@ #include "log.h" #include "onak-conf.h" +extern struct dbfuncs DBFUNCS; + /* * config - Runtime configuration for onak. * @@ -43,6 +45,14 @@ struct onak_config config = { NULL, /* pg_dbname */ NULL, /* pg_dbuser */ NULL, /* pg_dbpass */ + + /* + * Options for dynamic backends. + */ + NULL, /* db_backend */ + NULL, /* backends_dir */ + + &DBFUNCS, /* Default dbfuncs struct */ }; void readconfig(const char *configfile) { @@ -60,9 +70,11 @@ void readconfig(const char *configfile) { fgets(curline, 1023, conffile); while (!feof(conffile)) { - for (i = strlen(curline) - 1; isspace(curline[i]); i--) { - curline[i] = 0; - } + for (i = strlen(curline) - 1; + i >= 0 && isspace(curline[i]); + i--) { + curline[i] = 0; + } if (curline[0] == '#' || curline[0] == 0) { /* @@ -125,6 +137,10 @@ void readconfig(const char *configfile) { /* * Not applicable; ignored for compatibility with pksd. */ + } else if (!strncmp("db_backend ", curline, 11)) { + config.db_backend = strdup(&curline[11]); + } else if (!strncmp("backends_dir ", curline, 13)) { + config.backends_dir = strdup(&curline[13]); } else { logthing(LOGTHING_ERROR, "Unknown config line: %s", curline); @@ -180,4 +196,12 @@ void cleanupconfig(void) { free(config.logfile); config.logfile = NULL; } + if (config.db_backend != NULL) { + free(config.db_backend); + config.db_backend = NULL; + } + if (config.backends_dir != NULL) { + free(config.backends_dir); + config.backends_dir = NULL; + } }