projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ka/pinba'
[collectd.git]
/
src
/
liboconfig
/
scanner.l
diff --git
a/src/liboconfig/scanner.l
b/src/liboconfig/scanner.l
index
0f146ca
..
9f0cd8e
100644
(file)
--- a/
src/liboconfig/scanner.l
+++ b/
src/liboconfig/scanner.l
@@
-44,6
+44,7
@@
static void ml_append (char *);
%x ML
WHITE_SPACE [\ \t\b]
NON_WHITE_SPACE [^\ \t\b]
%x ML
WHITE_SPACE [\ \t\b]
NON_WHITE_SPACE [^\ \t\b]
+EOL (\r\n|\n)
QUOTED_STRING ([^\\"]+|\\.)*
UNQUOTED_STRING [0-9A-Za-z_]+
HEX_NUMBER 0[xX][0-9a-fA-F]+
QUOTED_STRING ([^\\"]+|\\.)*
UNQUOTED_STRING [0-9A-Za-z_]+
HEX_NUMBER 0[xX][0-9a-fA-F]+
@@
-62,14
+63,14
@@
IPV4_ADDR {IP_BYTE}\.{IP_BYTE}\.{IP_BYTE}\.{IP_BYTE}(:{PORT})?
{WHITE_SPACE} |
{COMMENT} {/* ignore */}
{WHITE_SPACE} |
{COMMENT} {/* ignore */}
-\\
\n
{/* continue line */}
+\\
{EOL}
{/* continue line */}
-
\n
{return (EOL);}
+
{EOL}
{return (EOL);}
"/" {return (SLASH);}
"<" {return (OPENBRAC);}
">" {return (CLOSEBRAC);}
"/" {return (SLASH);}
"<" {return (OPENBRAC);}
">" {return (CLOSEBRAC);}
-{BOOL_TRUE} {yylval.boolean = 1; return (TRUE);}
-{BOOL_FALSE} {yylval.boolean = 0; return (FALSE);}
+{BOOL_TRUE} {yylval.boolean = 1; return (
B
TRUE);}
+{BOOL_FALSE} {yylval.boolean = 0; return (
B
FALSE);}
{IPV4_ADDR} {yylval.string = yytext; return (UNQUOTED_STRING);}
{IPV4_ADDR} {yylval.string = yytext; return (UNQUOTED_STRING);}
@@
-78,19
+79,31
@@
IPV4_ADDR {IP_BYTE}\.{IP_BYTE}\.{IP_BYTE}\.{IP_BYTE}(:{PORT})?
\"{QUOTED_STRING}\" {yylval.string = yytext; return (QUOTED_STRING);}
{UNQUOTED_STRING} {yylval.string = yytext; return (UNQUOTED_STRING);}
\"{QUOTED_STRING}\" {yylval.string = yytext; return (QUOTED_STRING);}
{UNQUOTED_STRING} {yylval.string = yytext; return (UNQUOTED_STRING);}
-\"{QUOTED_STRING}\\\n {
+\"{QUOTED_STRING}\\{EOL} {
+ int len = strlen (yytext);
+
ml_pos = 0;
ml_pos = 0;
- /* remove "\\\n" */
- yytext[strlen (yytext) - 2] = '\0';
+ /* remove "\\<EOL>" */
+ if ('\r' == yytext[len - 2])
+ len -= 3;
+ else
+ len -= 2;
+ yytext[len] = '\0';
ml_append (yytext);
BEGIN (ML);
}
<ML>^{WHITE_SPACE}+ {/* remove leading white-space */}
ml_append (yytext);
BEGIN (ML);
}
<ML>^{WHITE_SPACE}+ {/* remove leading white-space */}
-<ML>{NON_WHITE_SPACE}{QUOTED_STRING}\\\n {
- /* remove "\\\n" */
- yytext[strlen (yytext) - 2] = '\0';
+<ML>{NON_WHITE_SPACE}{QUOTED_STRING}\\{EOL} {
+ int len = strlen (yytext);
+
+ /* remove "\\<EOL>" */
+ if ('\r' == yytext[len - 2])
+ len -= 3;
+ else
+ len -= 2;
+ yytext[len] = '\0';
ml_append(yytext);
}
ml_append(yytext);
}