configparser: allow multiple quotes in one line

bareos · Aug 27, 2020 · 5c1e664 · 5c1e664
1 parent f75dc5b
commit 5c1e664
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/core/src/lib/lex.cc b/core/src/lib/lex.cc
@@ -585,6 +585,17 @@ static bool NextLineContinuesWithQuotes(LEX* lf)
   return false;
 }
 
+static bool CurrentLineContinuesWithQuotes(LEX* lf)
+{
+  int i = lf->col_no;
+  while (lf->line[i] != '\0') {
+    if (lf->line[i] == '"') { return true; }
+    if (lf->line[i] != ' ' && lf->line[i] != '\t') { return false; }
+    ++i;
+  };
+  return false;
+}
+
 /*
  *
  * Get the next token from the input
@@ -647,10 +658,7 @@ int LexGetToken(LEX* lf, int expect)
             BeginStr(lf, ch);
             break;
           case ' ':
-            if (continue_string) {
-              //
-              continue;
-            }
+            if (continue_string) { continue; }
             break;
           case '"':
             lf->state = lex_quoted_string;
@@ -810,7 +818,8 @@ int LexGetToken(LEX* lf, int expect)
           break;
         }
         if (ch == '"') {
-          if (NextLineContinuesWithQuotes(lf)) {
+          if (NextLineContinuesWithQuotes(lf) ||
+              CurrentLineContinuesWithQuotes(lf)) {
             continue_string = true;
             lf->state = lex_none;
             continue;