diff options
| -rw-r--r-- | usr.bin/telnet/commands.c | 6 | ||||
| -rw-r--r-- | usr.bin/telnet/externs.h | 29 | ||||
| -rw-r--r-- | usr.bin/tn3270/ctlr/inbound.c | 6 | ||||
| -rw-r--r-- | usr.bin/tn3270/tn3270/Makefile | 4 |
4 files changed, 37 insertions, 8 deletions
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index 5db9aa1d1e9..5b083e1564b 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commands.c,v 1.10 1998/03/12 04:57:29 art Exp $ */ +/* $OpenBSD: commands.c,v 1.11 1998/03/12 17:31:30 deraadt Exp $ */ /* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */ /* @@ -1320,7 +1320,7 @@ togcrmod() } /*VARARGS*/ - static int + int telnetsuspend() { #ifdef SIGTSTP @@ -2133,7 +2133,7 @@ status(argc, argv) sigiocount, (sigiocount == 1)? "":"s"); if (In3270) { printf("Process ID %d, process group %d.\r\n", - getpid(), getpgrp(getpid())); + getpid(), getpgrp()); printf("Terminal input:\r\n"); filestuff(tin); printf("Terminal output:\r\n"); diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h index de15608e0d7..187b9b78d75 100644 --- a/usr.bin/telnet/externs.h +++ b/usr.bin/telnet/externs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: externs.h,v 1.3 1998/03/12 04:57:31 art Exp $ */ +/* $OpenBSD: externs.h,v 1.4 1998/03/12 17:31:32 deraadt Exp $ */ /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */ /* @@ -80,6 +80,10 @@ extern int crmod, netdata, /* Print out network data flow */ prettydump, /* Print "netdata" output in user readable format */ +#if defined(TN3270) + cursesdata, /* Print out curses data flow */ + apitrace, /* Trace API transactions */ +#endif /* defined(TN3270) */ termdata, /* Print out terminal data flow */ debug; /* Debug level */ @@ -429,3 +433,26 @@ extern Ring ttyoring, ttyiring; +/* Tn3270 section */ +#if defined(TN3270) + +extern int + HaveInput, /* Whether an asynchronous I/O indication came in */ + noasynchtty, /* Don't do signals on I/O (SIGURG, SIGIO) */ + noasynchnet, /* Don't do signals on I/O (SIGURG, SIGIO) */ + sigiocount, /* Count of SIGIO receptions */ + shell_active; /* Subshell is active */ + +extern char + *Ibackp, /* Oldest byte of 3270 data */ + Ibuf[], /* 3270 buffer */ + *Ifrontp, /* Where next 3270 byte goes */ + tline[], + *transcom; /* Transparent command */ + +extern int + settranscom P((int, char**)); + +extern void + inputAvailable P((int)); +#endif /* defined(TN3270) */ diff --git a/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c index 18f64708b81..a07ecf735ce 100644 --- a/usr.bin/tn3270/ctlr/inbound.c +++ b/usr.bin/tn3270/ctlr/inbound.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inbound.c,v 1.2 1996/06/26 05:41:19 deraadt Exp $ */ +/* $OpenBSD: inbound.c,v 1.3 1998/03/12 17:31:42 deraadt Exp $ */ /*- * Copyright (c) 1988 The Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)inbound.c 4.3 (Berkeley) 4/26/91";*/ -static char rcsid[] = "$OpenBSD: inbound.c,v 1.2 1996/06/26 05:41:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: inbound.c,v 1.3 1998/03/12 17:31:42 deraadt Exp $"; #endif /* not lint */ #include <stdio.h> @@ -998,7 +998,7 @@ unsigned int case FCN_DISC: StopScreen(1); - suspend(); + telnetsuspend(); setconnmode(); ConnectScreen(); break; diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index 78da6f1f5e2..194d3304447 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 1997/03/26 00:35:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 1998/03/12 17:31:44 deraadt Exp $ .include "../../Makefile.inc" CFLAGS += -I${.CURDIR} -I. +CFLAGS +=-I${.CURDIR}/../../../lib +CFLAGS +=-I${.CURDIR}/../../telnet LDADD += -locurses -ltermcap -ltelnet DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} ${LIBTELNET} |