From Gisle Vanem <[email protected]>: treat CR as white space in

expressions.

diff --git a/CREDITS b/CREDITS
index a701f411728493eea0e37dfb2ac9f8bddeb0230f..ee26f8c79f0b220763ac669f9aa965ed4156600b 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -27,6 +27,7 @@ Additional people who have contributed patches:
        Don Ebright                     <[email protected]> 
        Franz Schaefer                  <[email protected]>
        Gianluca Varenni                <[email protected]>
+       Gisle Vanem                     <[email protected]>
        Graeme Hewson                   <[email protected]>
        Greg Stark                      <[email protected]>
        Greg Troxel                     <[email protected]>

diff --git a/scanner.l b/scanner.l
index d7fd4bfcdb440edd7642eef861f2ce707c6b0a2a..36f51d4c085cceabe6307159fb0636886f8f3a8c 100644 (file)
--- 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;