diff options
Diffstat (limited to 'ui/text_import_scanner.l')
| -rw-r--r-- | ui/text_import_scanner.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/text_import_scanner.l b/ui/text_import_scanner.l index 23e6d24adb..9af93643e4 100644 --- a/ui/text_import_scanner.l +++ b/ui/text_import_scanner.l @@ -73,8 +73,8 @@ %} hexdigit [0-9A-Fa-f] -directive #TEXT2PCAP.* -comment #[^W].* +directive ^#TEXT2PCAP.*\r?\n +comment ^[\t ]*#.*\r?\n byte [0-9A-Fa-f][0-9A-Fa-f][ \t] byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n offset [0-9A-Fa-f]+[: \t] @@ -92,8 +92,8 @@ eol \r?\n\r? {mailfwd}{offset} { parse_token(T_OFFSET, yytext+1); } {eol} { parse_token(T_EOL, NULL); } [ \t] ; /* ignore whitespace */ -{directive} { parse_token(T_DIRECTIVE, yytext); } -{comment} ; /* ignore comments */ +{directive} { parse_token(T_DIRECTIVE, yytext); parse_token(T_EOL, NULL); } +{comment} { parse_token(T_EOL, NULL); } {text} { parse_token(T_TEXT, yytext); } <<EOF>> { write_current_packet(); yyterminate(); } |