Handle lines ending in \r\n.

[obnox/wireshark/wip.git] / text2pcap-scanner.l

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index ed81b23c8f27a3f668489af151689d39afac0d75..b47edadc3fb3fb683c2937eb41174f50c62edad6 100644 (file)
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -61,9 +61,9 @@ hexdigit [0-9A-Fa-f]
 directive #TEXT2PCAP.*
 comment #[^W].*
 byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
-byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
+byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n
 offset [0-9A-Fa-f]+[: \t]
-offset_eol [0-9A-Fa-f]+\n
+offset_eol [0-9A-Fa-f]+\r?\n
 text [^ \n\t]+
 mailfwd >
 eol \r?\n\r?