Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename debug to telnet_debug, to allow static linking with libssh.a.

Browse Source
This commit is contained in:
he 2006-02-02 19:33:12 +00:00
parent b4eeee2a61
commit 9dfcf4d44d
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/telnet/commands.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: commands.c,v 1.62 2006/01/25 04:20:54 christos Exp $ */
/* $NetBSD: commands.c,v 1.63 2006/02/02 19:33:12 he Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: commands.c,v 1.62 2006/01/25 04:20:54 christos Exp $");
__RCSID("$NetBSD: commands.c,v 1.63 2006/02/02 19:33:12 he Exp $");
#endif
#endif /* not lint */
@ -536,7 +536,7 @@ static int
togdebug(int n)
{
if (net > 0 &&
(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) {
(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) {
perror("setsockopt (SO_DEBUG)");
}
return 1;
@ -757,7 +757,7 @@ static struct togglelist Togglelist[] = {
{ "debug",
"debugging",
togdebug,
&debug,
&telnet_debug,
"turn on socket level debugging" },
{ "netdata",
"printing of hexadecimal network data (debugging)",
@ -2323,7 +2323,7 @@ tn(int argc, char *argv[])
continue;
}
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)");
}
if (hostp[0] == '@' || hostp[0] == '!') {

4
usr.bin/telnet/externs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: externs.h,v 1.33 2005/02/06 20:39:35 dsl Exp $ */
/* $NetBSD: externs.h,v 1.34 2006/02/02 19:33:12 he Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -95,7 +95,7 @@ extern int
apitrace, /* Trace API transactions */
#endif /* defined(TN3270) */
termdata, /* Print out terminal data flow */
debug, /* Debug level */
telnet_debug, /* Debug level */
doaddrlookup, /* do a reverse address lookup? */
clienteof; /* Client received EOF */

6
usr.bin/telnet/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.23 2004/01/05 23:35:41 jmmv Exp $ */
/* $NetBSD: main.c,v 1.24 2006/02/02 19:33:12 he Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: main.c,v 1.23 2004/01/05 23:35:41 jmmv Exp $");
__RCSID("$NetBSD: main.c,v 1.24 2006/02/02 19:33:12 he Exp $");
#endif
#endif /* not lint */
@ -205,7 +205,7 @@ main(int argc, char *argv[])
skiprc = 1;
break;
case 'd':
debug = 1;
telnet_debug = 1;
break;
case 'e':
set_escape_char(optarg);

6
usr.bin/telnet/telnet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: telnet.c,v 1.30 2005/03/29 12:18:28 drochner Exp $ */
/* $NetBSD: telnet.c,v 1.31 2006/02/02 19:33:12 he Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: telnet.c,v 1.30 2005/03/29 12:18:28 drochner Exp $");
__RCSID("$NetBSD: telnet.c,v 1.31 2006/02/02 19:33:12 he Exp $");
#endif
#endif /* not lint */
@ -94,7 +94,7 @@ int
showoptions,
In3270, /* Are we in 3270 mode? */
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>)? */