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 844f0b8..559ad97 100644 (file)
--- a/usr/src/usr.bin/telnet/terminal.c
+++ b/usr/src/usr.bin/telnet/terminal.c
@@ -2,16 +2,23 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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 1.11 (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>


@@ -25,14 +32,39 @@ static char sccsid[] = "@(#)terminal.c      1.11 (Berkeley) %G%";
 Ring   ttyoring, ttyiring;
 char   ttyobuf[2*BUFSIZ], ttyibuf[BUFSIZ];
 
 Ring   ttyoring, ttyiring;
 char   ttyobuf[2*BUFSIZ], ttyibuf[BUFSIZ];
 

-char
-    termEofChar,
-    termEraseChar,
-    termFlushChar,
-    termIntChar,
-    termKillChar,
-    termLiteralNextChar,
-    termQuitChar;
+int termdata;                  /* Debugging flag */
+
+#ifdef USE_TERMIO
+# ifndef VFLUSHO
+cc_t termFlushChar;
+# endif
+# ifndef VLNEXT
+cc_t termLiteralNextChar;
+# endif
+# ifndef VSUSP
+cc_t termSuspChar;
+# endif
+# ifndef VWERASE
+cc_t termWerasChar;
+# endif
+# ifndef VREPRINT
+cc_t termRprntChar;
+# endif
+# ifndef VSTART
+cc_t termStartChar;
+# endif
+# ifndef VSTOP
+cc_t termStopChar;
+# endif
+# ifndef VEOL
+cc_t termForw1Char;
+# endif
+# ifndef VEOL2
+cc_t termForw2Char;
+# endif
+#else
+cc_t termForw2Char;
+#endif

 
 /*
  * initialize the terminal data structures.
 
 /*
  * initialize the terminal data structures.


@@ -40,8 +72,12 @@ char
 
 init_terminal()
 {
 
 init_terminal()
 {

-    ring_init(&ttyoring, ttyobuf, sizeof ttyobuf);
-    ring_init(&ttyiring, ttyibuf, sizeof ttyibuf);
+    if (ring_init(&ttyoring, ttyobuf, sizeof ttyobuf) != 1) {
+       exit(1);
+    }
+    if (ring_init(&ttyiring, ttyibuf, sizeof ttyibuf) != 1) {
+       exit(1);
+    }

     autoflush = TerminalAutoFlush();
 }
 
     autoflush = TerminalAutoFlush();
 }
 


@@ -49,8 +85,11 @@ init_terminal()
 /*
  *             Send as much data as possible to the terminal.
  *
 /*
  *             Send as much data as possible to the terminal.
  *

- *             The return value indicates whether we did any
- *     useful work.
+ *             Return value:
+ *                     -1: No useful work done, data waiting to go out.
+ *                      0: No data was waiting, so nothing was done.
+ *                      1: All waiting data was written out.
+ *                      n: All data - n was written out.

  */
 
 
  */
 
 


@@ -70,6 +109,9 @@ int drop;
        }
     }
     if (n > 0) {
        }
     }
     if (n > 0) {

+       if (termdata && n) {
+           Dump('>', ttyoring.consume, n);
+       }

        /*
         * If we wrote everything, and the full count is
         * larger than what we wrote, then write the
        /*
         * If we wrote everything, and the full count is
         * larger than what we wrote, then write the


@@ -83,7 +125,14 @@ int drop;
        }
        ring_consumed(&ttyoring, n);
     }
        }
        ring_consumed(&ttyoring, n);
     }

-    return n > 0;
+    if (n < 0)
+       return -1;
+    if (n == n0) {
+       if (n0)
+           return -1;
+       return 0;
+    }
+    return n0 - n + 1;

 }
 
 \f
 }
 
 \f


@@ -96,34 +145,52 @@ int drop;
 int
 getconnmode()
 {
 int
 getconnmode()
 {

-    static char newmode[16] =
-                       { 4, 5, 3, 3, 2, 2, 1, 1, 6, 6, 6, 6, 6, 6, 6, 6 };
-    int modeindex = 0;
-
-    if (dontlecho && (clocks.echotoggle > clocks.modenegotiated)) {
-       modeindex += 1;
-    }
-    if (hisopts[TELOPT_ECHO]) {
-       modeindex += 2;
-    }
-    if (hisopts[TELOPT_SGA]) {
-       modeindex += 4;
-    }
-    if (In3270) {
-       modeindex += 8;
+    extern int linemode;
+    int mode = 0;
+#ifdef KLUDGELINEMODE
+    extern int kludgelinemode;
+#endif
+
+    if (In3270)
+       return(MODE_FLOW);
+
+    if (my_want_state_is_dont(TELOPT_ECHO))
+       mode |= MODE_ECHO;
+
+    if (localflow)
+       mode |= MODE_FLOW;
+
+    if (my_want_state_is_will(TELOPT_BINARY))
+       mode |= MODE_INBIN;
+
+    if (his_want_state_is_will(TELOPT_BINARY))
+       mode |= MODE_OUTBIN;
+
+#ifdef KLUDGELINEMODE
+    if (kludgelinemode) {
+       if (my_want_state_is_dont(TELOPT_SGA)) {
+           mode |= (MODE_TRAPSIG|MODE_EDIT);
+           if (dontlecho && (clocks.echotoggle > clocks.modenegotiated)) {
+               mode &= ~MODE_ECHO;
+           }
+       }
+       return(mode);

     }
     }

-    return newmode[modeindex];
+#endif
+    if (my_want_state_is_will(TELOPT_LINEMODE))
+       mode |= linemode;
+    return(mode);

 }
 
 void
 }
 
 void

-setconnmode()
+setconnmode(force)

 {
 {

-    TerminalNewMode(getconnmode());
+    TerminalNewMode(getconnmode()|(force?MODE_FORCE:0));

 }
 
 
 void
 setcommandmode()
 {
 }
 
 
 void
 setcommandmode()
 {

-    TerminalNewMode(0);
+    TerminalNewMode(-1);

 }
 }