remove tenex transfer support. if you still have TOPS20 machines in

service, you'll need to stick with openbsd 5.6.
bonus: remove references to ebcdic.
ok deraadt

7 files changed, 14 insertions, 55 deletions

diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index e0dc7f24e45..38ad2c1759c 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.73 2015/01/16 06:40:08 deraadt Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.74 2015/01/30 04:45:45 tedu Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
@@ -98,18 +98,6 @@ setascii(int argc, char *argv[])
 }
 
 /*
- * Set tenex transfer type.
- */
-/*ARGSUSED*/
-void
-settenex(int argc, char *argv[])
-{
-
-	stype[1] = "tenex";
-	settype(2, stype);
-}
-
-/*
  * Set file transfer mode.
  */
 /*ARGSUSED*/
diff --git a/usr.bin/ftp/cmds.h b/usr.bin/ftp/cmds.h
index 2d7740761b2..1ddae53a6d3 100644
--- a/usr.bin/ftp/cmds.h
+++ b/usr.bin/ftp/cmds.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.h,v 1.1 2009/05/05 19:35:30 martynas Exp $	*/
+/*	$OpenBSD: cmds.h,v 1.2 2015/01/30 04:45:45 tedu Exp $	*/
 
 /*
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -17,7 +17,6 @@
  */
 
 void	setascii(int, char **);
-void	settenex(int, char **);
 void	setftmode(int, char **);
 void	setform(int, char **);
 void	setstruct(int, char **);
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 9aa3e24849e..40389c3f056 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.27 2013/01/06 22:12:28 martynas Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.28 2015/01/30 04:45:45 tedu Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -111,7 +111,6 @@ char	statushelp[] =	"show current status";
 char	structhelp[] =	"set file transfer structure";
 char	suniquehelp[] = "toggle store unique on remote machine";
 char	systemhelp[] =  "show remote system type";
-char	tenexhelp[] =	"set tenex file transfer type";
 char	tracehelp[] =	"toggle packet tracing";
 char	typehelp[] =	"set file transfer type";
 char	umaskhelp[] =	"get (set) umask on remote side";
@@ -201,7 +200,6 @@ struct cmd cmdtab[] = {
 	{ "struct",	H(structhelp),	0, 1, 1, CMPL0		setstruct },
 	{ "sunique",	H(suniquehelp),	0, 0, 1, CMPL0		setsunique },
 	{ "system",	H(systemhelp),	0, 1, 1, CMPL0		syst },
-	{ "tenex",	H(tenexhelp),	0, 1, 1, CMPL0		settenex },
 	{ "trace",	H(tracehelp),	0, 0, 0, CMPL0		settrace },
 	{ "type",	H(typehelp),	0, 1, 1, CMPL0		settype },
 	{ "umask",	H(umaskhelp),	0, 1, 1, CMPL0		do_umask },
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 74a6b809063..60282bafa61 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.94 2014/11/15 14:41:02 bentley Exp $
+.\" 	$OpenBSD: ftp.1,v 1.95 2015/01/30 04:45:45 tedu Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd $Mdocdate: November 15 2014 $
+.Dd $Mdocdate: January 30 2015 $
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -1224,11 +1224,6 @@ The remote server will report the unique name.
 Default value is off.
 .It Ic system
 Show the type of operating system running on the remote machine.
-.It Ic tenex
-Set the file transfer type to that needed to
-talk to
-.Tn TENEX
-machines.
 .It Ic trace Op Ic on | off
 Toggle packet tracing.
 .It Ic type Op Ar type-name
@@ -1525,17 +1520,10 @@ The
 may be one of
 .Dq ascii ,
 .Dq binary ,
-.Dq image ,
-.Dq ebcdic
-.Pq currently not supported
 or
-.Dq tenex
-(local byte size 8, for PDP-10's and PDP-20's mostly).
+.Dq image .
 .Nm
-supports the ASCII and image types of file transfer,
-plus local byte size 8 for
-.Ic tenex
-mode transfers.
+supports the ASCII and image types of file transfer.
 .Pp
 .Nm
 supports only the default values for the remaining
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 717a9164dca..f898f009230 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp.c,v 1.89 2015/01/16 06:40:08 deraadt Exp $	*/
+/*	$OpenBSD: ftp.c,v 1.90 2015/01/30 04:45:45 tedu Exp $	*/
 /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
 
 /*
@@ -707,7 +707,6 @@ sendrequest(const char *cmd, const char *local, const char *remote,
 			rc = fseeko(fin, restart_point, SEEK_SET);
 			break;
 		case TYPE_I:
-		case TYPE_L:
 			if (lseek(fileno(fin), restart_point, SEEK_SET) != -1)
 				rc = 0;
 			break;
@@ -759,7 +758,6 @@ sendrequest(const char *cmd, const char *local, const char *remote,
 	switch (curtype) {
 
 	case TYPE_I:
-	case TYPE_L:
 		d = 0;
 		while ((c = read(fileno(fin), buf, sizeof(buf))) > 0) {
 			may_send_noop_char();
@@ -1075,7 +1073,6 @@ recvrequest(const char *cmd, const char * volatile local, const char *remote,
 	switch (curtype) {
 
 	case TYPE_I:
-	case TYPE_L:
 		if (restart_point &&
 		    lseek(fileno(fout), restart_point, SEEK_SET) < 0) {
 			warn("local: %s", local);
diff --git a/usr.bin/ftp/small.c b/usr.bin/ftp/small.c
index 8954fe93c81..1d22d9e647d 100644
--- a/usr.bin/ftp/small.c
+++ b/usr.bin/ftp/small.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: small.c,v 1.3 2015/01/16 06:40:08 deraadt Exp $	*/
+/*	$OpenBSD: small.c,v 1.4 2015/01/30 04:45:45 tedu Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
@@ -91,13 +91,10 @@ struct	types {
 	char	*t_name;
 	char	*t_mode;
 	int	t_type;
-	char	*t_arg;
 } types[] = {
-	{ "ascii",	"A",	TYPE_A,	0 },
-	{ "binary",	"I",	TYPE_I,	0 },
-	{ "image",	"I",	TYPE_I,	0 },
-	{ "ebcdic",	"E",	TYPE_E,	0 },
-	{ "tenex",	"L",	TYPE_L,	bytename },
+	{ "ascii",	"A",	TYPE_A },
+	{ "binary",	"I",	TYPE_I },
+	{ "image",	"I",	TYPE_I },
 	{ NULL }
 };
 
@@ -136,10 +133,7 @@ settype(int argc, char *argv[])
 		code = -1;
 		return;
 	}
-	if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
-		comret = command("TYPE %s %s", p->t_mode, p->t_arg);
-	else
-		comret = command("TYPE %s", p->t_mode);
+	comret = command("TYPE %s", p->t_mode);
 	if (comret == COMPLETE) {
 		(void)strlcpy(typename, p->t_name, sizeof typename);
 		curtype = type = p->t_type;
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 8c576580160..fc26ec57ac3 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.68 2015/01/16 06:40:08 deraadt Exp $	*/
+/*	$OpenBSD: util.c,v 1.69 2015/01/30 04:45:45 tedu Exp $	*/
 /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
 
 /*-
@@ -209,11 +209,6 @@ setpeer(int argc, char *argv[])
 				unix_proxy = 0;
 			else
 				unix_server = 0;
-			if (overbose &&
-			    !strncmp(reply_string, "215 TOPS20", 10))
-				fputs(
-"Remember to set tenex mode when transferring binary files from this machine.\n",
-				    ttyout);
 		}
 		verbose = overbose;
 #endif /* unix || BSD */