denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Support CRLF in settings parser

Browse Source
This commit is contained in:
Tobias Brunner
2018-05-23 12:01:45 +02:00
parent 26b45beda9
commit f8c20fb1c2
2 changed files with 114 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/settings/settings_lexer.l
+9 -6
View File
@@ -56,8 +56,8 @@ static void include_files(parser_helper_t *ctx);
%%
[\t ]*#[^\n]* /* eat comments */
[\t ]+ /* eat whitespace */
[\t ]*#[^\r\n]* /* eat comments */
[\t\r ]+ /* eat whitespace */
\n|#.*\n return NEWLINE; /* also eats comments at the end of a line */
"{" |
@@ -74,12 +74,13 @@ static void include_files(parser_helper_t *ctx);
yy_push_state(str, yyscanner);
}
[^#{}="\n\t ]+ {
[^#{}="\r\n\t ]+ {
yylval->s = strdup(yytext);
return NAME;
}
<inc>{
\r /* just ignore these */
/* we allow all characters except #, } and spaces, they can be escaped */
<<EOF>> |
[#}\n\t ] {
@@ -111,12 +112,13 @@ static void include_files(parser_helper_t *ctx);
\\["#} ] {
yyextra->string_add(yyextra, yytext+1);
}
[^"\\#}\n\t ]+ {
[^"\\#}\r\n\t ]+ {
yyextra->string_add(yyextra, yytext);
}
}
<str>{
\r /* just ignore these */
"\"" |
<<EOF>> |
\\ {
@@ -138,12 +140,13 @@ static void include_files(parser_helper_t *ctx);
return STRING;
}
}
\\n yyextra->string_add(yyextra, "\n");
\\r yyextra->string_add(yyextra, "\r");
\\t yyextra->string_add(yyextra, "\t");
\\\r?\n /* merge lines that end with EOL characters */
\\\r?\n /* merge lines that end with escaped EOL characters */
\\. yyextra->string_add(yyextra, yytext+1);
[^\\"]+ {
[^\\\r"]+ {
yyextra->string_add(yyextra, yytext);
}
}