BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / telnet / terminal.c

diff --git a/usr/src/usr.bin/telnet/terminal.c b/usr/src/usr.bin/telnet/terminal.c
index 1822ad7..559ad97 100644 (file)
--- a/usr/src/usr.bin/telnet/terminal.c
+++ b/usr/src/usr.bin/telnet/terminal.c
@@ -1,12 +1,24 @@
 /*
 /*

- * Copyright (c) 1988, 1990 Regents of the University of California.
+ * Copyright (c) 1988 Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)terminal.c 5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)terminal.c 1.21 (Berkeley) 6/28/90";

 #endif /* not lint */
 
 #include <arpa/telnet.h>
 #endif /* not lint */
 
 #include <arpa/telnet.h>


@@ -23,7 +35,7 @@ char  ttyobuf[2*BUFSIZ], ttyibuf[BUFSIZ];
 int termdata;                  /* Debugging flag */
 
 #ifdef USE_TERMIO
 int termdata;                  /* Debugging flag */
 
 #ifdef USE_TERMIO

-# ifndef VDISCARD
+# ifndef VFLUSHO

 cc_t termFlushChar;
 # endif
 # ifndef VLNEXT
 cc_t termFlushChar;
 # endif
 # ifndef VLNEXT


@@ -50,12 +62,8 @@ cc_t termForw1Char;
 # ifndef VEOL2
 cc_t termForw2Char;
 # endif
 # ifndef VEOL2
 cc_t termForw2Char;
 # endif

-# ifndef VSTATUS
-cc_t termAytChar;
-# endif

 #else
 cc_t termForw2Char;
 #else
 cc_t termForw2Char;

-cc_t termAytChar;

 #endif
 
 /*
 #endif
 
 /*