diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/telnet/commands.c | 16 | ||||
| -rw-r--r-- | usr.bin/telnet/externs.h | 2 | ||||
| -rw-r--r-- | usr.bin/telnet/main.c | 10 | ||||
| -rw-r--r-- | usr.bin/telnet/network.c | 8 | ||||
| -rw-r--r-- | usr.bin/telnet/ring.c | 8 | ||||
| -rw-r--r-- | usr.bin/telnet/sys_bsd.c | 12 | ||||
| -rw-r--r-- | usr.bin/telnet/telnet.c | 10 | ||||
| -rw-r--r-- | usr.bin/telnet/terminal.c | 8 | ||||
| -rw-r--r-- | usr.bin/telnet/utilities.c | 8 |
9 files changed, 41 insertions, 41 deletions
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index e0c5b62..489481f 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/un.h> @@ -517,11 +517,11 @@ togdebug(void) { #ifndef NOT43 if (net > 0 && - (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) { + (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) { perror("setsockopt (SO_DEBUG)"); } #else /* NOT43 */ - if (debug) { + if (telnet_debug) { if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) perror("setsockopt (SO_DEBUG)"); } else @@ -692,7 +692,7 @@ static struct togglelist Togglelist[] = { { "debug", "debugging", (int (*)(int))togdebug, - &debug, + &telnet_debug, "turn on socket level debugging" }, { "netdata", "printing of hexadecimal network data (debugging)", @@ -2146,7 +2146,7 @@ tn(int argc, char *argv[]) } #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) { + if (telnet_debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) { perror("setsockopt (SO_DEBUG)"); } diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h index 1129817..b4fd327 100644 --- a/usr.bin/telnet/externs.h +++ b/usr.bin/telnet/externs.h @@ -127,7 +127,7 @@ extern int netdata, /* Print out network data flow */ prettydump, /* Print "netdata" output in user readable format */ termdata, /* Print out terminal data flow */ - debug, /* Debug level */ + telnet_debug, /* Debug level */ doaddrlookup, /* do a reverse lookup? */ clienteof; /* Client received EOF */ diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index 676f13f..e007348 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> @@ -180,7 +180,7 @@ main(int argc, char *argv[]) skiprc = 1; break; case 'd': - debug = 1; + telnet_debug = 1; break; case 'e': set_escape_char(optarg); diff --git a/usr.bin/telnet/network.c b/usr.bin/telnet/network.c index b93f825..cdcd419 100644 --- a/usr.bin/telnet/network.c +++ b/usr.bin/telnet/network.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/usr.bin/telnet/ring.c b/usr.bin/telnet/ring.c index ac415a9..b6e2bea 100644 --- a/usr.bin/telnet/ring.c +++ b/usr.bin/telnet/ring.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * This defines a structure for a ring buffer. diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c index 5d931bf..45ef1e2 100644 --- a/usr.bin/telnet/sys_bsd.c +++ b/usr.bin/telnet/sys_bsd.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <stdlib.h> -#include <err.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> +#include <err.h> #include <errno.h> #include <fcntl.h> #include <signal.h> +#include <stdlib.h> #include <unistd.h> #include <arpa/telnet.h> diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c index 27aeaa9..75c27a5 100644 --- a/usr.bin/telnet/telnet.c +++ b/usr.bin/telnet/telnet.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> @@ -89,7 +89,7 @@ int connected, showoptions, ISend, /* trying to send network data in */ - debug = 0, + telnet_debug = 0, crmod, netdata, /* Print out network data flow */ crlf, /* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */ diff --git a/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c index b6e4a47..bea4e4d 100644 --- a/usr.bin/telnet/terminal.c +++ b/usr.bin/telnet/terminal.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <arpa/telnet.h> #include <sys/types.h> diff --git a/usr.bin/telnet/utilities.c b/usr.bin/telnet/utilities.c index 4a51966..d1eb8a8 100644 --- a/usr.bin/telnet/utilities.c +++ b/usr.bin/telnet/utilities.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #define TELOPTS #define TELCMDS |
