shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

conf-parser: support continuation lines with trailing backslashes in lines

Browse Source
This commit is contained in:
Lennart Poettering 2010-07-07 18:20:42 +02:00
parent 54165a3939
commit 3dab29438c
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/conf-parser.c
View File

@ -142,6 +142,7 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
char *section = NULL;
int r;
bool ours = false;
char *continuation = NULL;
assert(filename);
assert(t);
@ -157,7 +158,8 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
}
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))
@ -168,7 +170,44 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
goto finish;
}
if ((r = parse_line(filename, ++line, &section, 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, &section, sections, t, relaxed, p, userdata);
free(c);
if (r < 0)
goto finish;
}
@ -176,6 +215,7 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
finish:
free(section);
free(continuation);
if (f && ours)
fclose(f);