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

[elogind.git] / src / conf-parser.c

diff --git a/src/conf-parser.c b/src/conf-parser.c
index a6d4d92aa29468e63adc3405dd256484c4137259..df3584dd04567bbc73272b2aebb6dd56c81803a1 100644 (file)
--- a/src/conf-parser.c
+++ b/src/conf-parser.c
@@ -32,7 +32,6 @@
 #include "log.h"
 
 #define COMMENTS "#;\n"
 #include "log.h"
 
 #define COMMENTS "#;\n"

-#define LINE_MAX 4096

 
 /* Run the user supplied parser for an assignment */
 static int next_assignment(
 
 /* Run the user supplied parser for an assignment */
 static int next_assignment(


@@ -50,7 +49,7 @@ static int next_assignment(
         assert(lvalue);
         assert(rvalue);
 
         assert(lvalue);
         assert(rvalue);
 

-        for (; t->parse; t++) {
+        for (; t->parse || t->lvalue; t++) {

 
                 if (t->lvalue && !streq(lvalue, t->lvalue))
                         continue;
 
                 if (t->lvalue && !streq(lvalue, t->lvalue))
                         continue;


@@ -143,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 *section = NULL;
         int r;
         bool ours = false;

+        char *continuation = NULL;

 
         assert(filename);
         assert(t);
 
         assert(filename);
         assert(t);


@@ -158,7 +158,8 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
         }
 
         while (!feof(f)) {
         }
 
         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))
 
                 if (!fgets(l, sizeof(l), f)) {
                         if (feof(f))


@@ -169,7 +170,44 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
                         goto finish;
                 }
 
                         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;
         }
 
                         goto finish;
         }
 


@@ -177,6 +215,7 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co
 
 finish:
         free(section);
 
 finish:
         free(section);

+        free(continuation);

 
         if (f && ours)
                 fclose(f);
 
         if (f && ours)
                 fclose(f);