From d148c7ab6c127aad82ae1063da7f599860729734 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 19 Mar 2015 18:34:02 +0100 Subject: [PATCH] settings: Merge quoted strings that span multiple lines --- src/libstrongswan/settings/settings_lexer.l | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libstrongswan/settings/settings_lexer.l b/src/libstrongswan/settings/settings_lexer.l index c6546f4643..176387f1f4 100644 --- a/src/libstrongswan/settings/settings_lexer.l +++ b/src/libstrongswan/settings/settings_lexer.l @@ -148,9 +148,8 @@ static void include_files(parser_helper_t *ctx); \\t yyextra->string_add(yyextra, "\t"); \\b yyextra->string_add(yyextra, "\b"); \\f yyextra->string_add(yyextra, "\f"); - \\(.|\n) { - yyextra->string_add(yyextra, yytext+1); - } + \\\r?\n /* merge lines that end with EOL characters */ + \\. yyextra->string_add(yyextra, yytext+1); [^\\\n"]+ { yyextra->string_add(yyextra, yytext); } -- 2.47.2