[src/trunk]: src/usr.bin/telnet G/C In3270 - always false

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a06fde77455d
branches:  trunk
changeset: 995276:a06fde77455d
user:      maya <maya%NetBSD.org@localhost>
date:      Fri Dec 14 06:08:18 2018 +0000

description:
G/C In3270 - always false

diffstat:

 usr.bin/telnet/commands.c |  9 ++++-----
 usr.bin/telnet/externs.h  |  3 +--
 usr.bin/telnet/telnet.c   |  7 +++----
 usr.bin/telnet/terminal.c |  7 ++-----
 4 files changed, 10 insertions(+), 16 deletions(-)

diffs (110 lines):

diff -r 2e03498ce16d -r a06fde77455d usr.bin/telnet/commands.c
--- a/usr.bin/telnet/commands.c Fri Dec 14 03:43:22 2018 +0000
+++ b/usr.bin/telnet/commands.c Fri Dec 14 06:08:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: commands.c,v 1.71 2018/12/13 04:49:19 maya Exp $       */
+/*     $NetBSD: commands.c,v 1.72 2018/12/14 06:08:18 maya Exp $       */
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
@@ -63,7 +63,7 @@
 #if 0
 static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: commands.c,v 1.71 2018/12/13 04:49:19 maya Exp $");
+__RCSID("$NetBSD: commands.c,v 1.72 2018/12/14 06:08:18 maya Exp $");
 #endif
 #endif /* not lint */
 
@@ -1296,9 +1296,8 @@
        }
        if (arg[0] != '\0')
                escape = arg[0];
-       if (!In3270) {
-               printf("Escape character is '%s'.\n", control(escape));
-       }
+
+       printf("Escape character is '%s'.\n", control(escape));
        (void) fflush(stdout);
        return 1;
 }
diff -r 2e03498ce16d -r a06fde77455d usr.bin/telnet/externs.h
--- a/usr.bin/telnet/externs.h  Fri Dec 14 03:43:22 2018 +0000
+++ b/usr.bin/telnet/externs.h  Fri Dec 14 06:08:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: externs.h,v 1.41 2018/12/13 05:22:14 maya Exp $        */
+/*     $NetBSD: externs.h,v 1.42 2018/12/14 06:08:18 maya Exp $        */
 
 /*
  * Copyright (c) 1988, 1990, 1993
@@ -71,7 +71,6 @@
     flushout,          /* flush output */
     connected,         /* Are we connected to the other side? */
     globalmode,                /* Mode tty should be in */
-    In3270,            /* Are we in 3270 mode? */
     telnetport,                /* Are we connected to the telnet port? */
     localflow,         /* Flow control handled locally */
     restartany,                /* If flow control, restart output on any character */
diff -r 2e03498ce16d -r a06fde77455d usr.bin/telnet/telnet.c
--- a/usr.bin/telnet/telnet.c   Fri Dec 14 03:43:22 2018 +0000
+++ b/usr.bin/telnet/telnet.c   Fri Dec 14 06:08:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: telnet.c,v 1.39 2018/12/13 05:22:14 maya Exp $ */
+/*     $NetBSD: telnet.c,v 1.40 2018/12/14 06:08:18 maya Exp $ */
 
 /*
  * Copyright (c) 1988, 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)telnet.c   8.4 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: telnet.c,v 1.39 2018/12/13 05:22:14 maya Exp $");
+__RCSID("$NetBSD: telnet.c,v 1.40 2018/12/14 06:08:18 maya Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,7 +91,6 @@
        skiprc = 0,
        connected,
        showoptions,
-       In3270,         /* Are we in 3270 mode? */
        ISend,          /* trying to send network data in */
        telnet_debug = 0,
        crmod,
@@ -176,7 +175,7 @@
     SB_CLEAR();
     ClearArray(options);
 
-    connected = In3270 = ISend = localflow = donebinarytoggle = 0;
+    connected = ISend = localflow = donebinarytoggle = 0;
 #if    defined(AUTHENTICATION) || defined(ENCRYPTION)
     auth_encrypt_connect(connected);
 #endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */
diff -r 2e03498ce16d -r a06fde77455d usr.bin/telnet/terminal.c
--- a/usr.bin/telnet/terminal.c Fri Dec 14 03:43:22 2018 +0000
+++ b/usr.bin/telnet/terminal.c Fri Dec 14 06:08:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: terminal.c,v 1.15 2005/02/19 23:28:41 christos Exp $   */
+/*     $NetBSD: terminal.c,v 1.16 2018/12/14 06:08:18 maya Exp $       */
 
 /*
  * Copyright (c) 1988, 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.15 2005/02/19 23:28:41 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.16 2018/12/14 06:08:18 maya Exp $");
 #endif
 #endif /* not lint */
 
@@ -153,9 +153,6 @@
     extern int kludgelinemode;
 #endif
 
-    if (In3270)
-       return(MODE_FLOW);
-
     if (my_want_state_is_dont(TELOPT_ECHO))
        mode |= MODE_ECHO;