Move us from old ftp(1) to Sunil's new ftp(1). The necessary modifications

have been made to make it behave. Any new misbehaviors can be fixed in tree.

OK florian@ deraadt@ "Have you committed ftp yet?"

1 files changed, 0 insertions, 231 deletions

diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
deleted file mode 100644
index de6b1b17369..00000000000
--- a/usr.bin/ftp/ftp_var.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$OpenBSD: ftp_var.h,v 1.41 2018/02/10 06:25:16 jsing Exp $	*/
-/*	$NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $	*/
-
-/*
- * Copyright (C) 1997 and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project 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 BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp_var.h	8.4 (Berkeley) 10/9/94
- */
-
-/*
- * FTP global variables.
- */
-
-#include <sys/signal.h>
-#include <limits.h>
-#include <setjmp.h>
-
-#ifndef SMALL
-#include <histedit.h>
-#endif /* !SMALL */
-
-#include <tls.h>
-
-#include "stringlist.h"
-#include "extern.h"
-#include "small.h"
-
-#define HASHBYTES	1024
-#define FTPBUFLEN	PATH_MAX + 200
-
-#define STALLTIME	5	/* # of seconds of no xfer before "stalling" */
-
-#define	FTP_PORT	21	/* default if ! getservbyname("ftp/tcp") */
-#define	GATE_PORT	21	/* default if ! getservbyname("ftpgate/tcp") */
-#define	HTTP_PORT	80	/* default if ! getservbyname("http/tcp") */
-#define	HTTPS_PORT	443	/* default if ! getservbyname("https/tcp") */
-#define	HTTP_USER_AGENT	"User-Agent: OpenBSD ftp"	/* User-Agent string sent to web server */
-
-#define PAGER		"more"	/* default pager if $PAGER isn't set */
-
-/*
- * Options and other state info.
- */
-int	trace;			/* trace packets exchanged */
-int	hash;			/* print # for each buffer transferred */
-int	mark;			/* number of bytes between hashes */
-int	sendport;		/* use PORT/LPRT cmd for each data connection */
-int	verbose;		/* print messages coming back from server */
-int	connected;		/* 1 = connected to server, -1 = logged in */
-int	fromatty;		/* input is from a terminal */
-int	interactive;		/* interactively prompt on m* cmds */
-#ifndef SMALL
-int	confirmrest;		/* confirm rest of current m* cmd */
-int	debug;			/* debugging level */
-int	bell;			/* ring bell on cmd completion */
-char   *altarg;			/* argv[1] with no shell-like preprocessing  */
-#endif /* !SMALL */
-int	doglob;			/* glob local file names */
-int	autologin;		/* establish user account on connection */
-int	proxy;			/* proxy server connection active */
-int	proxflag;		/* proxy connection exists */
-int	gatemode;		/* use gate-ftp */
-char   *gateserver;		/* server to use for gate-ftp */
-int	sunique;		/* store files on server with unique name */
-int	runique;		/* store local files with unique name */
-int	mcase;			/* map upper to lower case for mget names */
-int	ntflag;			/* use ntin ntout tables for name translation */
-int	mapflag;		/* use mapin mapout templates on file names */
-int	preserve;		/* preserve modification time on files */
-int	progress;		/* display transfer progress bar */
-int	code;			/* return/reply code for ftp command */
-int	crflag;			/* if 1, strip car. rets. on ascii gets */
-char	pasv[BUFSIZ];		/* passive port for proxy data connection */
-int	passivemode;		/* passive mode enabled */
-int	activefallback;		/* fall back to active mode if passive fails */
-char	ntin[17];		/* input translation table */
-char	ntout[17];		/* output translation table */
-char	mapin[PATH_MAX];	/* input map template */
-char	mapout[PATH_MAX];	/* output map template */
-char	typename[32];		/* name of file transfer type */
-int	type;			/* requested file transfer type */
-int	curtype;		/* current file transfer type */
-char	structname[32];		/* name of file transfer structure */
-int	stru;			/* file transfer structure */
-char	formname[32];		/* name of file transfer format */
-int	form;			/* file transfer format */
-char	modename[32];		/* name of file transfer mode */
-int	mode;			/* file transfer mode */
-char	bytename[32];		/* local byte size in ascii */
-int	bytesize;		/* local byte size in binary */
-int	anonftp;		/* automatic anonymous login */
-int	dirchange;		/* remote directory changed by cd command */
-unsigned int retry_connect;	/* retry connect if failed */
-int	ttywidth;		/* width of tty */
-int	epsv4;			/* use EPSV/EPRT on IPv4 connections */
-int	epsv4bad;		/* EPSV doesn't work on the current server */
-
-#ifndef SMALL
-int	  editing;		/* command line editing enabled */
-EditLine *el;			/* editline(3) status structure */
-History  *hist;			/* editline(3) history structure */
-char	 *cursor_pos;		/* cursor position we're looking for */
-size_t	  cursor_argc;		/* location of cursor in margv */
-size_t	  cursor_argo;		/* offset of cursor in margv[cursor_argc] */
-int	  resume;		/* continue transfer */
-char	 *srcaddr;		/* source address to bind to */
-#endif /* !SMALL */
-
-char	 *cookiefile;		/* cookie jar to use */
-
-off_t	bytes;			/* current # of bytes read */
-off_t	filesize;		/* size of file being transferred */
-char   *direction;		/* direction transfer is occurring */
-
-char   *hostname;		/* name of host connected to */
-int	unix_server;		/* server is unix, can use binary for ascii */
-int	unix_proxy;		/* proxy is unix, can use binary for ascii */
-
-char *ftpport;			/* port number to use for ftp connections */
-char *httpport;			/* port number to use for http connections */
-#ifndef NOSSL
-char *httpsport;		/* port number to use for https connections */
-#endif /* !SMALL */
-char *httpuseragent;		/* user agent for http(s) connections */
-char *gateport;			/* port number to use for gateftp connections */
-
-jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
-
-#ifndef SMALL
-char	line[FTPBUFLEN];	/* input line buffer */
-char	*argbase;		/* current storage point in arg buffer */
-char	*stringbase;		/* current scan point in line buffer */
-char	argbuf[FTPBUFLEN];	/* argument storage buffer */
-StringList *marg_sl;		/* stringlist containing margv */
-int	margc;			/* count of arguments on input line */
-int	options;		/* used during socket creation */
-#endif /* !SMALL */
-
-#define margv (marg_sl->sl_str)	/* args parsed from input line */
-int     cpend;                  /* flag: if != 0, then pending server reply */
-int	mflag;			/* flag: if != 0, then active multi command */
-
-/*
- * Format of command table.
- */
-struct cmd {
-	char	*c_name;	/* name of command */
-	char	*c_help;	/* help string */
-	char	 c_bell;	/* give bell when command completes */
-	char	 c_conn;	/* must be connected to use command */
-	char	 c_proxy;	/* proxy server may execute */
-#ifndef SMALL
-	char	*c_complete;	/* context sensitive completion list */
-#endif /* !SMALL */
-	void	(*c_handler)(int, char **); /* function to call */
-};
-
-struct macel {
-	char mac_name[9];	/* macro name */
-	char *mac_start;	/* start of macro in macbuf */
-	char *mac_end;		/* end of macro in macbuf */
-};
-
-#ifndef SMALL
-int macnum;			/* number of defined macros */
-struct macel macros[16];
-char macbuf[4096];
-#endif /* !SMALL */
-
-FILE	*ttyout;		/* stdout or stderr, depending on interactive */
-
-extern struct cmd cmdtab[];
-
-#ifndef NOSSL
-extern struct tls_config *tls_config;
-extern int tls_session_fd;
-#endif /* !NOSSL */