Bump the sccs id to 5.1

SCCS-vsn: usr.bin/telnet/defines.h 5.1
SCCS-vsn: usr.bin/telnet/externs.h 5.1
SCCS-vsn: usr.bin/telnet/fdset.h 5.1
SCCS-vsn: usr.bin/telnet/general.h 5.1
SCCS-vsn: usr.bin/telnet/krb4-proto.h 5.1
SCCS-vsn: usr.bin/telnet/network.c 5.1
SCCS-vsn: usr.bin/telnet/ring.c 5.1
SCCS-vsn: usr.bin/telnet/ring.h 5.1
SCCS-vsn: usr.bin/telnet/tn3270.c 5.1
SCCS-vsn: usr.bin/telnet/types.h 5.1
SCCS-vsn: usr.bin/telnet/utilities.c 5.1

diff --git a/usr/src/usr.bin/telnet/defines.h b/usr/src/usr.bin/telnet/defines.h
index 8d7d9de..a60946b 100644 (file)
--- a/usr/src/usr.bin/telnet/defines.h
+++ b/usr/src/usr.bin/telnet/defines.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)defines.h   1.10 (Berkeley) %G%
+ *     @(#)defines.h   5.1 (Berkeley) %G%

  */
 
 #define        settimer(x)     clocks.x = clocks.system++
  */
 
 #define        settimer(x)     clocks.x = clocks.system++

diff --git a/usr/src/usr.bin/telnet/externs.h b/usr/src/usr.bin/telnet/externs.h
index 254f5a4..8f86bae 100644 (file)
--- a/usr/src/usr.bin/telnet/externs.h
+++ b/usr/src/usr.bin/telnet/externs.h
@@ -1,10 +1,10 @@
 /*
 /*

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

  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *
  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)externs.h   1.25 (Berkeley) %G%
+ *     @(#)externs.h   5.1 (Berkeley) %G%

  */
 
 #ifndef        BSD
  */
 
 #ifndef        BSD


@@ -40,6 +40,17 @@ typedef unsigned char cc_t;
 # endif
 #endif
 
 # endif
 #endif
 

+#ifndef        _POSIX_VDISABLE
+# ifdef sun
+#  include <sys/param.h>       /* pick up VDISABLE definition, mayby */
+# endif
+# ifdef VDISABLE
+#  define _POSIX_VDISABLE VDISABLE
+# else
+#  define _POSIX_VDISABLE ((unsigned char)'\377')
+# endif
+#endif
+

 #define        SUBBUFSIZE      256
 
 extern int errno;              /* outside this world */
 #define        SUBBUFSIZE      256
 
 extern int errno;              /* outside this world */


@@ -222,6 +233,7 @@ extern struct       sgttyb nttyb;
 # define termStopChar          ntc.t_stopc
 # define termForw1Char         ntc.t_brkc
 extern cc_t termForw2Char;
 # define termStopChar          ntc.t_stopc
 # define termForw1Char         ntc.t_brkc
 extern cc_t termForw2Char;

+extern cc_t termAytChar;

 
 # define termEofCharp          (cc_t *)&ntc.t_eofc
 # define termEraseCharp                (cc_t *)&nttyb.sg_erase
 
 # define termEofCharp          (cc_t *)&ntc.t_eofc
 # define termEraseCharp                (cc_t *)&nttyb.sg_erase


@@ -237,6 +249,7 @@ extern cc_t termForw2Char;
 # define termStopCharp         (cc_t *)&ntc.t_stopc
 # define termForw1Charp                (cc_t *)&ntc.t_brkc
 # define termForw2Charp                (cc_t *)&termForw2Char
 # define termStopCharp         (cc_t *)&ntc.t_stopc
 # define termForw1Charp                (cc_t *)&ntc.t_brkc
 # define termForw2Charp                (cc_t *)&termForw2Char

+# define termAytCharp          (cc_t *)&termAytChar

 
 # else
 
 
 # else
 


@@ -253,13 +266,13 @@ extern cc_t termSuspChar;
 # else
 #  define termSuspChar         new_tc.c_cc[VSUSP]
 # endif
 # else
 #  define termSuspChar         new_tc.c_cc[VSUSP]
 # endif

-# if   !defined(VFLUSHO) && defined(VDISCARD)
-#  define VFLUSHO VDISCARD
+# if   defined(VFLUSHO) && !defined(VDISCARD)
+#  define VDISCARD VFLUSHO

 # endif
 # endif

-# ifndef       VFLUSHO
+# ifndef       VDISCARD

 extern cc_t termFlushChar;
 # else
 extern cc_t termFlushChar;
 # else

-#  define termFlushChar                new_tc.c_cc[VFLUSHO]
+#  define termFlushChar                new_tc.c_cc[VDISCARD]

 # endif
 # ifndef VWERASE
 extern cc_t termWerasChar;
 # endif
 # ifndef VWERASE
 extern cc_t termWerasChar;


@@ -296,8 +309,13 @@ extern cc_t termForw2Char;
 # else
 #  define termForw2Char                new_tc.c_cc[VEOL]
 # endif
 # else
 #  define termForw2Char                new_tc.c_cc[VEOL]
 # endif

+# ifndef       VSTATUS
+extern cc_t termAytChar;
+#else
+#  define termAytChar          new_tc.c_cc[VSTATUS]
+#endif

 
 

-# ifndef CRAY
+# if !defined(CRAY) || defined(__STDC__)

 #  define termEofCharp         &termEofChar
 #  define termEraseCharp       &termEraseChar
 #  define termIntCharp         &termIntChar
 #  define termEofCharp         &termEofChar
 #  define termEraseCharp       &termEraseChar
 #  define termIntCharp         &termIntChar


@@ -312,6 +330,7 @@ extern cc_t termForw2Char;
 #  define termStopCharp                &termStopChar
 #  define termForw1Charp       &termForw1Char
 #  define termForw2Charp       &termForw2Char
 #  define termStopCharp                &termStopChar
 #  define termForw1Charp       &termForw1Char
 #  define termForw2Charp       &termForw2Char

+#  define termAytCharp         &termAytChar

 # else
        /* Work around a compiler bug */
 #  define termEofCharp         0
 # else
        /* Work around a compiler bug */
 #  define termEofCharp         0


@@ -328,6 +347,7 @@ extern cc_t termForw2Char;
 #  define termStopCharp                0
 #  define termForw1Charp       0
 #  define termForw2Charp       0
 #  define termStopCharp                0
 #  define termForw1Charp       0
 #  define termForw2Charp       0

+#  define termAytCharp         0

 # endif
 #endif
 
 # endif
 #endif
 

diff --git a/usr/src/usr.bin/telnet/fdset.h b/usr/src/usr.bin/telnet/fdset.h
index 7d3db92..a0c1712 100644 (file)
--- a/usr/src/usr.bin/telnet/fdset.h
+++ b/usr/src/usr.bin/telnet/fdset.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fdset.h     1.5 (Berkeley) %G%
+ *     @(#)fdset.h     5.1 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/usr.bin/telnet/general.h b/usr/src/usr.bin/telnet/general.h
index 7492b8d..dfdf14a 100644 (file)
--- a/usr/src/usr.bin/telnet/general.h
+++ b/usr/src/usr.bin/telnet/general.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)general.h   1.5 (Berkeley) %G%
+ *     @(#)general.h   5.1 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/usr.bin/telnet/network.c b/usr/src/usr.bin/telnet/network.c
index 972ca63..9a077f9 100644 (file)
--- a/usr/src/usr.bin/telnet/network.c
+++ b/usr/src/usr.bin/telnet/network.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)network.c  1.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)network.c  5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>

diff --git a/usr/src/usr.bin/telnet/ring.c b/usr/src/usr.bin/telnet/ring.c
index de738e7..034e74c 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.c
+++ b/usr/src/usr.bin/telnet/ring.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ring.c     1.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)ring.c     5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*

diff --git a/usr/src/usr.bin/telnet/ring.h b/usr/src/usr.bin/telnet/ring.h
index 78d555a..1db4611 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.h
+++ b/usr/src/usr.bin/telnet/ring.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ring.h      1.10 (Berkeley) %G%
+ *     @(#)ring.h      5.1 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/usr.bin/telnet/tn3270.c b/usr/src/usr.bin/telnet/tn3270.c
index dbb72ed..7b71696 100644 (file)
--- a/usr/src/usr.bin/telnet/tn3270.c
+++ b/usr/src/usr.bin/telnet/tn3270.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tn3270.c   1.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)tn3270.c   5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>

diff --git a/usr/src/usr.bin/telnet/types.h b/usr/src/usr.bin/telnet/types.h
index d6e55f2..769c196 100644 (file)
--- a/usr/src/usr.bin/telnet/types.h
+++ b/usr/src/usr.bin/telnet/types.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     1.4 (Berkeley) %G%
+ *     @(#)types.h     5.1 (Berkeley) %G%

  */
 
 typedef struct {
  */
 
 typedef struct {

diff --git a/usr/src/usr.bin/telnet/utilities.c b/usr/src/usr.bin/telnet/utilities.c
index cf8641a..98cdba7 100644 (file)
--- a/usr/src/usr.bin/telnet/utilities.c
+++ b/usr/src/usr.bin/telnet/utilities.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        1.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c        5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        TELOPTS
 #endif /* not lint */
 
 #define        TELOPTS