Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 11:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GH-1497: Support CRLF line-endings in Zeek scripts and signature files

Browse source
This commit is contained in:
Jon Siwek 2021-04-08 20:15:54 -07:00
parent 4ae056b1a3
commit 312547ab0a
6 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rule-scan.l
View file

@ -24,12 +24,12 @@ WS [ \t]+
D [0-9]+
H [0-9a-fA-F]+
HEX {H}
STRING \"([^\n\"]|\\\")*\"
STRING \"([^\r\n\"]|\\\")*\"
IDCOMPONENT [a-zA-Z_][0-9a-zA-Z_-]*
ID {IDCOMPONENT}(::{IDCOMPONENT})*
IP6 ("["({HEX}:){7}{HEX}"]")|("["0x{HEX}({HEX}|:)*"::"({HEX}|:)*"]")|("["({HEX}|:)*"::"({HEX}|:)*"]")|("["({HEX}|:)*"::"({HEX}|:)*({D}"."){3}{D}"]")
RE \/(\\\/)?([^/]|[^\\]\\\/)*\/i?
META \.[^ \t]+{WS}[^\n]+
META \.[^ \t]+{WS}[^\r\n]+
PIDCOMPONENT [A-Za-z_][A-Za-z_0-9]*
PID {PIDCOMPONENT}(::{PIDCOMPONENT})*
@ -41,7 +41,7 @@ PID {PIDCOMPONENT}(::{PIDCOMPONENT})*
#.* /* eat comments */
{WS} /* eat white space */
{META} /* eat any meta-data/comments */
\n ++rules_line_number;
\r?\n ++rules_line_number;
}
{IP6} {