From b415228a7fb86e7dd110897418120a209ae441e0 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 5 May 1996 04:34:33 +0000
Subject: [PATCH] Do binary per default

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@489 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnet/main.c   | 5 ++++-
 appl/telnet/telnet/telnet.1 | 6 +++++-
 appl/telnet/telnet/telnet.c | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index 7f8a4ffc6..847e08b1d 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -130,11 +130,14 @@ int main(int argc, char **argv)
 	 */
 	autologin = -1;
 
-	while ((ch = getopt(argc, argv, "8EKLS:X:acde:fFk:l:n:rt:x")) != EOF) {
+	while ((ch = getopt(argc, argv, "78EKLS:X:acde:fFk:l:n:rt:x")) != EOF) {
 		switch(ch) {
 		case '8':
 			eight = 3;	/* binary output and input */
 			break;
+		case '7':
+			eight = 0;
+			break;
 		case 'E':
 			rlogin = escape = _POSIX_VDISABLE;
 			break;
diff --git a/appl/telnet/telnet/telnet.1 b/appl/telnet/telnet/telnet.1
index b996fea3b..c043f43fa 100644
--- a/appl/telnet/telnet/telnet.1
+++ b/appl/telnet/telnet/telnet.1
@@ -41,7 +41,7 @@
 protocol
 .Sh SYNOPSIS
 .Nm telnet
-.Op Fl 8EFKLacdfrx
+.Op Fl 78EFKLacdfrx
 .Op Fl S Ar tos
 .Op Fl X Ar authtype
 .Op Fl e Ar escapechar
@@ -78,6 +78,10 @@ Specifies an 8-bit data path.  This causes an attempt to
 negotiate the
 .Dv TELNET BINARY
 option on both input and output.
+.It Fl 7
+Do not try to negotiate
+.Dv TELNET BINARY
+option.
 .It Fl E
 Stops any character from being recognized as an escape character.
 .It Fl F
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index 922ac6199..4d31d97c5 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -76,7 +76,7 @@ char	do_dont_resp[256];
 char	will_wont_resp[256];
 
 int
-	eight = 0,
+	eight = 3,
 	autologin = 0,	/* Autologin anyone? */
 	skiprc = 0,
 	connected,