X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=conf-parser.c;h=0388a24bcc315a5cc556986371ef6a7f5e8cbf23;hb=6632c6023c5f90e15440231500d3431e869e4577;hp=3a7da7960ca84f5f5418f95603d27beed4702808;hpb=42f4e3c4413ad35e3815f25211fee95d775488a7;p=elogind.git diff --git a/conf-parser.c b/conf-parser.c index 3a7da7960..0388a24bc 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -10,9 +10,10 @@ #include "util.h" #include "macro.h" #include "strv.h" +#include "log.h" -#define WHITESPACE " \t\n" #define COMMENTS "#;\n" +#define NEWLINES "\n\r" #define LINE_MAX 4096 /* Run the user supplied parser for an assignment */ @@ -44,8 +45,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'.\n", 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 */ @@ -77,16 +78,19 @@ static char *strip(char *s) { /* Parse a variable assignment line */ 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; + char *e, *b, *c; b = l+strspn(l, WHITESPACE); - if ((c = strpbrk(b, COMMENTS))) + if ((c = strpbrk(b, NEWLINES))) *c = 0; if (!*b) return 0; + if (strchr(COMMENTS, *b)) + return 0; + if (startswith(b, ".include ")) { char *path = NULL, *fn; int r; @@ -109,7 +113,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const } } - r = config_parse(fn, sections, t, userdata); + r = config_parse(fn, NULL, sections, t, userdata); free(path); return r; } @@ -122,7 +126,7 @@ 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.\n", filename, line); + log_error("[%s:%u] Invalid section header.", filename, line); return -EBADMSG; } @@ -151,7 +155,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const } if (!(e = strchr(b, '='))) { - fprintf(stderr, "[%s:%u] Missing '='.\n", filename, line); + log_error("[%s:%u] Missing '='.", filename, line); return -EBADMSG; } @@ -162,19 +166,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 char* const * sections, 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\n", 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)) { @@ -185,7 +190,7 @@ int config_parse(const char *filename, const char* const * sections, const Confi break; r = -errno; - fprintf(stderr, "Failed to read configuration file '%s': %s\n", filename, strerror(-r)); + log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); goto finish; } @@ -222,7 +227,7 @@ int config_parse_int( assert(data); if ((r = safe_atoi(rvalue, i)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -247,7 +252,7 @@ int config_parse_unsigned( assert(data); if ((r = safe_atou(rvalue, u)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -273,7 +278,7 @@ int config_parse_size( assert(data); if ((r = safe_atou(rvalue, &u)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue); + log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue); return r; } @@ -299,7 +304,7 @@ int config_parse_bool( assert(data); if ((k = parse_boolean(rvalue)) < 0) { - fprintf(stderr, "[%s:%u] Failed to parse boolean value: %s\n", filename, line, rvalue); + log_error("[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue); return k; } @@ -336,6 +341,36 @@ 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, @@ -359,7 +394,7 @@ int config_parse_strv( assert(data); k = strv_length(*sv); - FOREACH_WORD(w, &l, rvalue, state) + FOREACH_WORD_QUOTED(w, l, rvalue, state) k++; if (!(n = new(char*, k+1))) @@ -367,7 +402,7 @@ int config_parse_strv( for (k = 0; (*sv)[k]; k++) n[k] = (*sv)[k]; - FOREACH_WORD(w, &l, rvalue, state) + FOREACH_WORD_QUOTED(w, l, rvalue, state) if (!(n[k++] = strndup(w, l))) goto fail; @@ -380,6 +415,7 @@ int config_parse_strv( fail: for (; k > 0; k--) free(n[k-1]); + free(n); return -ENOMEM; }