aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguy <guy>2003-02-08 19:27:00 +0000
committerguy <guy>2003-02-08 19:27:00 +0000
commit52866495a0123c3ad7ada8a31555a57c9173f6ff (patch)
treeaa84bb2f0d9472966f9fdccdb6a604ec115075c9
parent6efec806a419d6835a61efce289e153ba1879329 (diff)
From Gisle Vanem <giva@bgnett.no>: treat CR as white space in
expressions.
-rw-r--r--CREDITS1
-rw-r--r--scanner.l4
2 files changed, 3 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index a701f411..ee26f8c7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -27,6 +27,7 @@ Additional people who have contributed patches:
Don Ebright <Don.Ebright@compuware.com>
Franz Schaefer <schaefer@mond.at>
Gianluca Varenni <varenni@netgroup-serv.polito.it>
+ Gisle Vanem <giva@bgnett.no>
Graeme Hewson <ghewson@cix.compulink.co.uk>
Greg Stark <gsstark@mit.edu>
Greg Troxel <gdt@ir.bbn.com>
diff --git a/scanner.l b/scanner.l
index d7fd4bfc..36f51d4c 100644
--- a/scanner.l
+++ b/scanner.l
@@ -22,7 +22,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.91 2002-12-06 00:01:35 hannes Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.92 2003-02-08 19:27:01 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -276,7 +276,7 @@ vci return VCI;
connectmsg return CONNECTMSG;
metaconnect return METACONNECT;
-[ \n\t] ;
+[ \r\n\t] ;
[+\-*/:\[\]!<>()&|=] return yytext[0];
">=" return GEQ;
"<=" return LEQ;