strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ed5f56
)
starter: Merge quoted strings that span multiple lines
author
Tobias Brunner
<tobias@strongswan.org>
Thu, 19 Mar 2015 17:33:19 +0000
(18:33 +0100)
committer
Tobias Brunner
<tobias@strongswan.org>
Fri, 20 Mar 2015 17:37:22 +0000
(18:37 +0100)
src/starter/parser/lexer.l
patch
|
blob
|
history
diff --git
a/src/starter/parser/lexer.l
b/src/starter/parser/lexer.l
index
a88cbe8
..
d967e74
100644
(file)
--- 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);
}