untabify.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 8384218dccb04fb73f23ffdb7691b6b99d14a45c..f6d8860ee28c35912633c3539850fd3b9a61d81c 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.142 2000-01-17 06:24:27 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.144 2000-04-21 10:32:03 assar Exp $ (LBL)";
 #endif
 
 /*
@@ -175,7 +175,7 @@ main(int argc, char **argv)
        
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:deE:fF:i:lnNm:Opqr:Rs:StT:vw:xXY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lm:nNOpqr:Rs:StT:vw:xXY")) != EOF)
                switch (op) {
 
                case 'a':
@@ -263,11 +263,17 @@ main(int argc, char **argv)
                        Rflag = 0;
                        break;
 
-               case 's':
-                       snaplen = atoi(optarg);
-                       if (snaplen <= 0)
+               case 's': {
+                       char *end;
+
+                       snaplen = strtol(optarg, &end, 0);
+                       if (optarg == end || *end != '\0'
+                           || snaplen < 0 || snaplen > 65535)
                                error("invalid snaplen %s", optarg);
+                       else if (snaplen == 0)
+                               snaplen = 65535;
                        break;
+               }
 
                case 'S':
                        ++Sflag;