line mode telnet mods

SCCS-vsn: sys/sys/ioctl.h 7.12
SCCS-vsn: sys/sys/termios.h 7.9

diff --git a/usr/src/sys/sys/ioctl.h b/usr/src/sys/sys/ioctl.h
index 90f68ae..9494899 100644 (file)
--- a/usr/src/sys/sys/ioctl.h
+++ b/usr/src/sys/sys/ioctl.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ioctl.h     7.11 (Berkeley) %G%
+ *     @(#)ioctl.h     7.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -122,6 +122,7 @@ struct ttysize {
 #define                TIOCPKT_START           0x08    /* start output */
 #define                TIOCPKT_NOSTOP          0x10    /* no more ^S, ^Q */
 #define                TIOCPKT_DOSTOP          0x20    /* now do ^S ^Q */
 #define                TIOCPKT_START           0x08    /* start output */
 #define                TIOCPKT_NOSTOP          0x10    /* no more ^S, ^Q */
 #define                TIOCPKT_DOSTOP          0x20    /* now do ^S ^Q */

+#define                TIOCPKT_IOCTL           0x40    /* state change of pty driver */

 #define                TIOCPKT_TIOC            0x40    /* transparent ioctl packet */
 #define        TIOCSTOP        _IO('t', 111)           /* stop output, like ^S */
 #define        TIOCSTART       _IO('t', 110)           /* start output, like ^Q */
 #define                TIOCPKT_TIOC            0x40    /* transparent ioctl packet */
 #define        TIOCSTOP        _IO('t', 111)           /* stop output, like ^S */
 #define        TIOCSTART       _IO('t', 110)           /* start output, like ^Q */


@@ -139,6 +140,8 @@ struct ttysize {
 #define        TIOCIOANS(s)    _IOWX('t', 99, (s))     /* pty: reply to user ioctl */
 #define        TIOCCONS        _IOW('t', 98, int)              /* become virtual console */
 #define        TIOCSCTTY       _IO('t', 97)            /* become controlling tty */
 #define        TIOCIOANS(s)    _IOWX('t', 99, (s))     /* pty: reply to user ioctl */
 #define        TIOCCONS        _IOW('t', 98, int)              /* become virtual console */
 #define        TIOCSCTTY       _IO('t', 97)            /* become controlling tty */

+#define        TIOCEXT         _IOW('t', 96, int)      /* pty: external processing */
+#define        TIOCSIG         _IO('t', 95)            /* pty: generate signal */

 
 #define TTYDISC                0               /* termios tty line discipline */
 #define        TABLDISC        3               /* tablet discipline */
 
 #define TTYDISC                0               /* termios tty line discipline */
 #define        TABLDISC        3               /* tablet discipline */

diff --git a/usr/src/sys/sys/termios.h b/usr/src/sys/sys/termios.h
index 089c3d4..0ad7a19 100644 (file)
--- a/usr/src/sys/sys/termios.h
+++ b/usr/src/sys/sys/termios.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)termios.h   7.8 (Berkeley) %G%
+ *     @(#)termios.h   7.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -34,36 +34,36 @@
 #define        VEOL            1       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define        VEOL2           2       /* ICANON */
 #define        VEOL            1       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define        VEOL2           2       /* ICANON */

-#endif  /*_POSIX_SOURCE */
+#endif

 #define        VERASE          3       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define VWERASE        4       /* ICANON */
 #define        VERASE          3       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define VWERASE        4       /* ICANON */

-#endif  /*_POSIX_SOURCE */
+#endif 

 #define VKILL          5       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define        VREPRINT        6       /* ICANON */
 #define VKILL          5       /* ICANON */
 #ifndef _POSIX_SOURCE
 #define        VREPRINT        6       /* ICANON */

-#endif  /*_POSIX_SOURCE */
+#endif

 /*                     7          spare 1 */
 #define VINTR          8       /* ISIG */
 #define VQUIT          9       /* ISIG */
 #define VSUSP          10      /* ISIG */
 #ifndef _POSIX_SOURCE
 #define VDSUSP         11      /* ISIG */
 /*                     7          spare 1 */
 #define VINTR          8       /* ISIG */
 #define VQUIT          9       /* ISIG */
 #define VSUSP          10      /* ISIG */
 #ifndef _POSIX_SOURCE
 #define VDSUSP         11      /* ISIG */

-#endif  /*_POSIX_SOURCE */
+#endif

 #define VSTART         12      /* IXON, IXOFF */
 #define VSTOP          13      /* IXON, IXOFF */
 #ifndef _POSIX_SOURCE
 #define        VLNEXT          14      /* IEXTEN */
 #define        VFLUSHO         15      /* IEXTEN */
 #define        VFLUSH          VFLUSHO /* for sun */
 #define VSTART         12      /* IXON, IXOFF */
 #define VSTOP          13      /* IXON, IXOFF */
 #ifndef _POSIX_SOURCE
 #define        VLNEXT          14      /* IEXTEN */
 #define        VFLUSHO         15      /* IEXTEN */
 #define        VFLUSH          VFLUSHO /* for sun */

-#endif  /*_POSIX_SOURCE */
+#endif

 #define VMIN           16      /* !ICANON */
 #define VTIME          17      /* !ICANON */
 #ifndef _POSIX_SOURCE
 #define VINFO          18      /* ICANON */
 /*                     19         spare 2 */
 #define        NCC             20
 #define VMIN           16      /* !ICANON */
 #define VTIME          17      /* !ICANON */
 #ifndef _POSIX_SOURCE
 #define VINFO          18      /* ICANON */
 /*                     19         spare 2 */
 #define        NCC             20

-#endif  /*_POSIX_SOURCE */
+#endif

 
 #define _POSIX_VDISABLE        ((unsigned char)'\377')
 
 
 #define _POSIX_VDISABLE        ((unsigned char)'\377')
 


@@ -108,7 +108,7 @@
  */
 #ifndef _POSIX_SOURCE
 #define        CIGNORE         0x00000001      /* ignore control flags */
  */
 #ifndef _POSIX_SOURCE
 #define        CIGNORE         0x00000001      /* ignore control flags */

-#endif  /*_POSIX_SOURCE */
+#endif

 #define CSIZE          0x00000300      /* character size mask */
 #define     CS5                    0x00000000      /* 5 bits (pseudo) */
 #define     CS6                    0x00000100      /* 6 bits */
 #define CSIZE          0x00000300      /* character size mask */
 #define     CS5                    0x00000000      /* 5 bits (pseudo) */
 #define     CS6                    0x00000100      /* 6 bits */


@@ -120,14 +120,14 @@
 #define PARODD         0x00002000      /* odd parity, else even */
 #ifndef _POSIX_SOURCE
 #define HUPCL          0x00004000      /* hang up on last close */
 #define PARODD         0x00002000      /* odd parity, else even */
 #ifndef _POSIX_SOURCE
 #define HUPCL          0x00004000      /* hang up on last close */

-#endif  /*_POSIX_SOURCE */
+#endif

 #define CLOCAL         0x00008000      /* ignore modem status lines */
 #ifndef _POSIX_SOURCE
 #define CCTS_OFLOW     0x00010000      /* CTS flow control of output */
 #define CRTSCTS                CCTS_OFLOW      /* ??? */
 #define CRTS_IFLOW     0x00020000      /* RTS flow control of input */
 #define        MDMBUF          0x00100000      /* flow control output via Carrier */
 #define CLOCAL         0x00008000      /* ignore modem status lines */
 #ifndef _POSIX_SOURCE
 #define CCTS_OFLOW     0x00010000      /* CTS flow control of output */
 #define CRTSCTS                CCTS_OFLOW      /* ??? */
 #define CRTS_IFLOW     0x00020000      /* RTS flow control of input */
 #define        MDMBUF          0x00100000      /* flow control output via Carrier */

-#endif  /*_POSIX_SOURCE */
+#endif

 
 
 /* 
 
 
 /* 


@@ -155,6 +155,7 @@
 #define ALTWERASE      0x00000200      /* use alternate WERASE algorithm */
 #endif  /*_POSIX_SOURCE */
 #define        IEXTEN          0x00000400      /* enable FLUSHO and LNEXT */
 #define ALTWERASE      0x00000200      /* use alternate WERASE algorithm */
 #endif  /*_POSIX_SOURCE */
 #define        IEXTEN          0x00000400      /* enable FLUSHO and LNEXT */

+#define EXTPROC         0x00000800      /* external processing */

 #define TOSTOP         0x00400000      /* stop background jobs from output */
 #ifndef _POSIX_SOURCE
 #define FLUSHO         0x00800000      /* output being flushed (state) */
 #define TOSTOP         0x00400000      /* stop background jobs from output */
 #ifndef _POSIX_SOURCE
 #define FLUSHO         0x00800000      /* output being flushed (state) */