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

Adjust for tn3270 cleanup.

Browse Source
This commit is contained in:
christos 1998-03-04 13:51:57 +00:00
parent eae55ce3e5
commit 346d9496c8
5 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: commands.c,v 1.17 1998/03/03 07:32:46 thorpej Exp $ */
/* $NetBSD: commands.c,v 1.18 1998/03/04 13:51:57 christos Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: commands.c,v 1.17 1998/03/03 07:32:46 thorpej Exp $");
__RCSID("$NetBSD: commands.c,v 1.18 1998/03/04 13:51:57 christos Exp $");
#endif
#endif /* not lint */
@ -1459,8 +1459,6 @@ shell(argc, argv)
}
return 1;
}
#else /* !defined(TN3270) */
extern int shell();
#endif /* !defined(TN3270) */
/*VARARGS*/

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

@ -1,4 +1,4 @@
/* $NetBSD: externs.h,v 1.9 1998/02/27 10:44:13 christos Exp $ */
/* $NetBSD: externs.h,v 1.10 1998/03/04 13:51:57 christos Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -517,14 +517,6 @@ extern cc_t termAytChar;
#endif
/* Ring buffer structures which are shared */
extern Ring
netoring,
netiring,
ttyoring,
ttyiring;
/* Tn3270 section */
#if defined(TN3270)
@ -555,5 +547,10 @@ void _putchar P((int));
void SetIn3270 P((void));
int tn3270_ttype P((void));
int settranscom P((int, char *[]));
int shell_continue P((void));
int DataFromTerminal __P((char *, int));
int DataFromNetwork __P((char *, int, int));
void ConnectScreen __P((void));
int DoTerminalOutput __P((void));
#endif /* defined(TN3270) */

10
usr.bin/telnet/ring.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ring.h,v 1.6 1998/02/27 10:44:14 christos Exp $ */
/* $NetBSD: ring.h,v 1.7 1998/03/04 13:51:57 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@ -59,6 +59,14 @@ typedef struct {
supplytime;
} Ring;
/* Ring buffer structures which are shared */
extern Ring
netoring,
netiring,
ttyoring,
ttyiring;
/* Here are some functions and macros to deal with the ring buffer */
/* Initialization routine */

12
usr.bin/telnet/tn3270.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tn3270.c,v 1.7 1998/02/27 10:44:15 christos Exp $ */
/* $NetBSD: tn3270.c,v 1.8 1998/03/04 13:51:57 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@ -38,13 +38,16 @@
#if 0
static char sccsid[] = "@(#)tn3270.c 8.2 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: tn3270.c,v 1.7 1998/02/27 10:44:15 christos Exp $");
__RCSID("$NetBSD: tn3270.c,v 1.8 1998/03/04 13:51:57 christos Exp $");
#endif
#endif /* not lint */
#include <sys/types.h>
#include <sys/time.h>
#include <arpa/telnet.h>
#ifdef __STDC__
#include <unistd.h>
#endif
#include "general.h"
@ -56,10 +59,13 @@ __RCSID("$NetBSD: tn3270.c,v 1.7 1998/02/27 10:44:15 christos Exp $");
#if defined(TN3270)
#include "../ctlr/screen.h"
#include "../ctlr/declare.h"
#include "../ascii/state.h"
#include "../general/globals.h"
#include "../sys_curses/telextrn.h"
#include "../ctlr/externs.h"
#if defined(unix)
int

8
usr.bin/telnet/utilities.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utilities.c,v 1.6 1998/02/27 10:44:15 christos Exp $ */
/* $NetBSD: utilities.c,v 1.7 1998/03/04 13:51:58 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: utilities.c,v 1.6 1998/02/27 10:44:15 christos Exp $");
__RCSID("$NetBSD: utilities.c,v 1.7 1998/03/04 13:51:58 christos Exp $");
#endif
#endif /* not lint */
@ -65,6 +65,10 @@ __RCSID("$NetBSD: utilities.c,v 1.6 1998/02/27 10:44:15 christos Exp $");
#include "externs.h"
#if defined(TN3270)
#include "../sys_curses/telextrn.h"
#endif
FILE *NetTrace = 0; /* Not in bss, since needs to stay */
int prettydump;