Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index cdce8398c2009f86e14dac72f717c77030867bd6..67aa666e7f6fb067d1e3dfb1891f54c15f6801e5 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -51,34 +51,28 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.6 2000-01-17 06:24:26 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.12 2000-09-29 04:58:51 guy Exp $";
 #endif
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <ctype.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
 
 #define TELCMDS
 #define TELOPTS
 #include <arpa/telnet.h>
 
 #include <stdio.h>
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <unistd.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 
-
 #ifndef TELCMD_FIRST
 # define TELCMD_FIRST SE
 #endif
@@ -174,11 +168,13 @@ telnet_print(register const u_char *sp, u_int length)
                        hex_print_with_offset(osp, i, off);
                        off += i;
                        if (i > 8)
-                               printf("\n\t\t\t\t%s", tnet);
+                               printf("\n\t\t\t\t");
                        else
-                               printf("%*s\t%s", (8 - i) * 3, "", tnet);
+                               printf("%*s\t", (8 - i) * 3, "");
+                       safeputs(tnet);
                } else {
-                       printf("%s%s", (first) ? " [telnet " : ", ", tnet);
+                       printf("%s", (first) ? " [telnet " : ", ");
+                       safeputs(tnet);
                }
                first = 0;
        }