X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=conf-parser.c;h=2f013e3f24c26f19a76aa7d1ec7b1d220cfbdf07;hp=c45acd770279a30429e78ea389338e8501238dad;hb=c43d20a0af915a2641e9645ba7f47f576f9075e3;hpb=ed5bcfbe3c3b68e59242c03649eea03a9707d318 diff --git a/conf-parser.c b/conf-parser.c index c45acd770..2f013e3f2 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -9,8 +9,9 @@ #include "conf-parser.h" #include "util.h" #include "macro.h" +#include "strv.h" +#include "log.h" -#define WHITESPACE " \t\n" #define COMMENTS "#;\n" #define LINE_MAX 4096 @@ -43,8 +44,8 @@ static int next_assignment( return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata); } - fprintf(stderr, "[%s:%u] Unknown lvalue '%s' in section '%s'.", filename, line, lvalue, strna(section)); - return -EBADMSG; + log_info("[%s:%u] Unknown lvalue '%s' in section '%s'. Ignoring.", filename, line, lvalue, strna(section)); + return 0; } /* Returns non-zero when c is contained in s */ @@ -75,7 +76,7 @@ static char *strip(char *s) { } /* Parse a variable assignment line */ -static int parse_line(const char *filename, unsigned line, char **section, const ConfigItem *t, char *l, void *userdata) { +static int parse_line(const char *filename, unsigned line, char **section, const char* const * sections, const ConfigItem *t, char *l, void *userdata) { char *e, *c, *b; b = l+strspn(l, WHITESPACE); @@ -108,7 +109,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const } } - r = config_parse(fn, t, userdata); + r = config_parse(fn, NULL, sections, t, userdata); free(path); return r; } @@ -121,13 +122,28 @@ static int parse_line(const char *filename, unsigned line, char **section, const assert(k > 0); if (b[k-1] != ']') { - fprintf(stderr, "[%s:%u] Invalid section header.", filename, line); + log_error("[%s:%u] Invalid section header.", filename, line); return -EBADMSG; } if (!(n = strndup(b+1, k-2))) return -ENOMEM; + if (sections) { + const char * const * i; + bool good = false; + STRV_FOREACH(i, sections) + if (streq(*i, n)) { + good = true; + break; + } + + if (!good) { + free(n); + return -EBADMSG; + } + } + free(*section); *section = n; @@ -135,7 +151,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const } if (!(e = strchr(b, '='))) { - fprintf(stderr, "[%s:%u] Missing '='.", filename, line); + log_error("[%s:%u] Missing '='.", filename, line); return -EBADMSG; } @@ -146,19 +162,20 @@ static int parse_line(const char *filename, unsigned line, char **section, const } /* Go through the file and parse each line */ -int config_parse(const char *filename, const ConfigItem *t, void *userdata) { +int config_parse(const char *filename, FILE *f, const char* const * sections, const ConfigItem *t, void *userdata) { unsigned line = 0; char *section = NULL; - FILE *f; int r; assert(filename); assert(t); - if (!(f = fopen(filename, "re"))) { - r = -errno; - fprintf(stderr, "Failed to open configuration file '%s': %s", filename, strerror(-r)); - goto finish; + if (!f) { + if (!(f = fopen(filename, "re"))) { + r = -errno; + log_error("Failed to open configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } } while (!feof(f)) { @@ -169,11 +186,11 @@ int config_parse(const char *filename, const ConfigItem *t, void *userdata) { break; r = -errno; - fprintf(stderr, "Failed to read configuration file '%s': %s", filename, strerror(-r)); + log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); goto finish; } - if ((r = parse_line(filename, ++line, §ion, t, l, userdata)) < 0) + if ((r = parse_line(filename, ++line, §ion, sections, t, l, userdata)) < 0) goto finish; } @@ -206,7 +223,7 @@ int config_parse_int( assert(data); if ((r = safe_atoi(rvalue, i)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -231,7 +248,7 @@ int config_parse_unsigned( assert(data); if ((r = safe_atou(rvalue, u)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -257,7 +274,7 @@ int config_parse_size( assert(data); if ((r = safe_atou(rvalue, &u)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -283,7 +300,7 @@ int config_parse_bool( assert(data); if ((k = parse_boolean(rvalue)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue); return k; } @@ -319,3 +336,82 @@ int config_parse_string( return 0; } + +int config_parse_path( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char **s = data; + char *n; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + if (*rvalue != '/') { + log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue); + return -EINVAL; + } + + if (!(n = strdup(rvalue))) + return -ENOMEM; + + free(*s); + *s = n; + + return 0; +} + +int config_parse_strv( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char*** sv = data; + char **n; + char *w; + unsigned k; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + k = strv_length(*sv); + FOREACH_WORD_QUOTED(w, l, rvalue, state) + k++; + + if (!(n = new(char*, k+1))) + return -ENOMEM; + + for (k = 0; (*sv)[k]; k++) + n[k] = (*sv)[k]; + FOREACH_WORD_QUOTED(w, l, rvalue, state) + if (!(n[k++] = strndup(w, l))) + goto fail; + + n[k] = NULL; + free(*sv); + *sv = n; + + return 0; + +fail: + for (; k > 0; k--) + free(n[k-1]); + free(n); + + return -ENOMEM; +}