diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-03-19 18:33:19 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-03-20 18:37:22 +0100 |
| commit | 79ebdc0788c74500560720cfe60227fea9ff9993 (patch) | |
| tree | 4d36c17b725a103eb56e613015f9ecdeea40d59c /src/starter/parser | |
| parent | 2ed5f5693d80ee2602d672e17f2210b6fbc3f0a1 (diff) | |
| download | strongswan-79ebdc0788c74500560720cfe60227fea9ff9993.tar.bz2 strongswan-79ebdc0788c74500560720cfe60227fea9ff9993.tar.xz | |
starter: Merge quoted strings that span multiple lines
Diffstat (limited to 'src/starter/parser')
| -rw-r--r-- | src/starter/parser/lexer.l | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l index a88cbe809..d967e745b 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); } |