-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#include "log.h"
#define COMMENTS "#;\n"
-#define LINE_MAX 4096
/* Run the user supplied parser for an assignment */
static int next_assignment(
unsigned line,
const char *section,
const ConfigItem *t,
+ bool relaxed,
const char *lvalue,
const char *rvalue,
void *userdata) {
assert(lvalue);
assert(rvalue);
- for (; t->parse; t++) {
+ for (; t->parse || t->lvalue; t++) {
if (t->lvalue && !streq(lvalue, t->lvalue))
continue;
if (t->section && !streq(section, t->section))
continue;
+ if (!t->parse)
+ return 0;
+
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
/* Warn about unknown non-extension fields. */
- if (!startswith(lvalue, "X-"))
+ if (!relaxed && !startswith(lvalue, "X-"))
log_info("[%s:%u] Unknown lvalue '%s' in section '%s'. Ignoring.", filename, line, lvalue, strna(section));
return 0;
}
/* 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) {
+static int parse_line(const char *filename, unsigned line, char **section, const char* const * sections, const ConfigItem *t, bool relaxed, char *l, void *userdata) {
char *e;
l = strstrip(l);
if (!(fn = file_in_same_dir(filename, strstrip(l+9))))
return -ENOMEM;
- r = config_parse(fn, NULL, sections, t, userdata);
+ r = config_parse(fn, NULL, sections, t, relaxed, userdata);
free(fn);
return r;
if (!(n = strndup(l+1, k-2)))
return -ENOMEM;
- if (sections && !strv_contains((char**) sections, n)) {
- log_error("[%s:%u] Unknown section '%s'.", filename, line, n);
- free(n);
- return -EBADMSG;
- }
+ if (!relaxed && sections && !strv_contains((char**) sections, n))
+ log_info("[%s:%u] Unknown section '%s'. Ignoring.", filename, line, n);
free(*section);
*section = n;
return 0;
}
+ if (sections && (!*section || !strv_contains((char**) sections, *section)))
+ return 0;
+
if (!(e = strchr(l, '='))) {
log_error("[%s:%u] Missing '='.", filename, line);
return -EBADMSG;
*e = 0;
e++;
- return next_assignment(filename, line, *section, t, strstrip(l), strstrip(e), userdata);
+ return next_assignment(filename, line, *section, t, relaxed, strstrip(l), strstrip(e), userdata);
}
/* Go through the file and parse each line */
-int config_parse(const char *filename, FILE *f, const char* const * sections, const ConfigItem *t, void *userdata) {
+int config_parse(const char *filename, FILE *f, const char* const * sections, const ConfigItem *t, bool relaxed, void *userdata) {
unsigned line = 0;
char *section = NULL;
int r;
bool ours = false;
+ char *continuation = NULL;
assert(filename);
assert(t);
}
while (!feof(f)) {
- char l[LINE_MAX];
+ char l[LINE_MAX], *p, *c = NULL, *e;
+ bool escaped = false;
if (!fgets(l, sizeof(l), f)) {
if (feof(f))
goto finish;
}
- if ((r = parse_line(filename, ++line, §ion, sections, t, l, userdata)) < 0)
+ truncate_nl(l);
+
+ if (continuation) {
+ if (!(c = strappend(continuation, l))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(continuation);
+ continuation = NULL;
+ p = c;
+ } else
+ p = l;
+
+ for (e = p; *e; e++) {
+ if (escaped)
+ escaped = false;
+ else if (*e == '\\')
+ escaped = true;
+ }
+
+ if (escaped) {
+ *(e-1) = ' ';
+
+ if (c)
+ continuation = c;
+ else if (!(continuation = strdup(l))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ continue;
+ }
+
+ r = parse_line(filename, ++line, §ion, sections, t, relaxed, p, userdata);
+ free(c);
+
+ if (r < 0)
goto finish;
}
finish:
free(section);
+ free(continuation);
if (f && ours)
fclose(f);
k = 0;
FOREACH_WORD_QUOTED(w, l, rvalue, state)
- if (!(n[k++] = strndup(w, l)))
+ if (!(n[k++] = cunescape_length(w, l)))
goto fail;
n[k] = NULL;
n[k] = (*sv)[k];
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- if (!(n[k] = strndup(w, l))) {
+ if (!(n[k] = cunescape_length(w, l))) {
r = -ENOMEM;
goto fail;
}