From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 19 Mar 2015 17:33:19 +0000 (+0100)
Subject: starter: Merge quoted strings that span multiple lines
X-Git-Tag: 5.3.0rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ebdc0788c74500560720cfe60227fea9ff9993;p=thirdparty%2Fstrongswan.git

starter: Merge quoted strings that span multiple lines
---

diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
index a88cbe8097..d967e745b3 100644
--- a/src/starter/parser/lexer.l
+++ b/src/starter/parser/lexer.l
@@ -152,9 +152,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);
 	}