initial checkin

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 75224e4c62ef8e5a999453e1f74f3478e0ed4d9d..8f2e5e3a7e64f19b1de79991a86d171e1a8bd774 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.183 2002-08-06 04:36:12 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.186 2002-09-05 21:25:51 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -222,7 +222,6 @@ main(int argc, char **argv)
        int devnum;
 #endif
 #ifdef WIN32
-       int ii;
        DWORD dwVersion;
        DWORD dwWindowsMajorVersion;
        u_int UserBufferSize=1000000;
@@ -476,12 +475,17 @@ main(int argc, char **argv)
                        ++Xflag;
                        break;
 
-#ifdef YYDEBUG
+#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
                case 'Y':
                        {
                        /* Undocumented flag */
+#ifdef HAVE_PCAP_DEBUG
+                       extern int pcap_debug;
+                       pcap_debug = 1;
+#else
                        extern int yydebug;
                        yydebug = 1;
+#endif
                        }
                        break;
 #endif
@@ -520,21 +524,7 @@ main(int argc, char **argv)
                                error("%s", ebuf);
                }
 #ifdef WIN32
-               else
-               {
-                       if (!(dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4))                   /* Windows '95 */
-                       {
-                               if(device[1]!=0)
-                                       device=(char*)SChar2WChar(device);
-                       }
-                       else{
-                               for (ii=0;ii<(signed)strlen(device);ii++)
-                               for (ii=strlen(device)-1;ii>0&&(device[ii]==' '||device[ii]=='\t');ii--)device[ii]='\0';
-                               for (ii=0;ii<(signed)strlen(device)&&(device[ii]==' '||device[ii]=='\t');ii++);
-                               strcpy(device,device+ii);
-                       }
-               }
-               PrintCapBegins (program_name,device);
+               PrintCapBegins(program_name,device);
 #endif /* WIN32 */
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
@@ -786,7 +776,7 @@ default_print(register const u_char *bp, register u_int length)
 }
 
 #ifdef SIGINFO
-RETSIGTYPE requestinfo(int signo)
+RETSIGTYPE requestinfo(int signo _U_)
 {
        if (infodelay)
                ++infoprint;
@@ -799,7 +789,11 @@ static void
 usage(void)
 {
        extern char version[];
+#if defined(WIN32) || defined(HAVE_PCAP_VERSION)
        extern char pcap_version[];
+#else
+       static char pcap_version[] = "unknown";
+#endif
 
 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);