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, relaxed, 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;
}