Import substantial improvements to ftp(1) from NetBSD, largely the

work of Luke Mewburn.

This includes, but is not limited to :

 - commandline editing and history.
 - local and remote filename completion.
 - a new progress display.
 - the ability to access files using either the ftp or http protocols,
   and use http proxies for ftp transfers.

The FreeeBSD "restricted ports" functionality was preserved.

Obtained from:	NetBSD

1 files changed, 57 insertions, 31 deletions

diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index fb9aecf..3acc671 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,3 +1,6 @@
+/*	$Id$ */
+/*	$NetBSD: extern.h,v 1.15 1997/04/14 09:09:17 lukem Exp $	*/
+
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
  * All rights reserved.
@@ -30,27 +33,33 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)extern.h	8.2 (Berkeley) 4/3/94
+ *	@(#)extern.h	8.3 (Berkeley) 10/9/94
  */
 
-struct timeval;
 struct fd_set;
 
 void    abort_remote __P((FILE *));
-void    abortpt __P(());
-void    abortrecv __P(());
-void    abortsend __P(());
+void    abortpt __P((int));
+void    abortrecv __P((int));
+void    abortsend __P((int));
+void    aborthttp __P((int));
 void	account __P((int, char **));
-int	another __P((int *, char ***, char *));
+void	alarmtimer __P((int));
+int	another __P((int *, char ***, const char *));
+int	auto_fetch __P((int, char **));
 void	blkfree __P((char **));
 void	cd __P((int, char **));
 void	cdup __P((int, char **));
 void	changetype __P((int, int));
-void	cmdabort __P(());
+void	cmdabort __P((int));
 void	cmdscanner __P((int));
-int	command __P(());
-int	confirm __P((char *, char *));
-FILE   *dataconn __P((char *));
+int	command __P((const char *, ...));
+#ifndef SMALL
+unsigned char complete __P((EditLine *, int));
+void	controlediting __P((void));
+#endif /* !SMALL */
+int	confirm __P((const char *, const char *));
+FILE   *dataconn __P((const char *));
 void	delete __P((int, char **));
 void	disconnect __P((int, char **));
 void	do_chmod __P((int, char **));
@@ -60,21 +69,22 @@ char   *domap __P((char *));
 void	doproxy __P((int, char **));
 char   *dotrans __P((char *));
 int     empty __P((struct fd_set *, int));
-void	fatal __P((char *));
 void	get __P((int, char **));
-struct cmd *getcmd __P((char *));
-int	getit __P((int, char **, int, char *));
+struct cmd *getcmd __P((const char *));
+int	getit __P((int, char **, int, const char *));
 int	getreply __P((int));
 int	globulize __P((char **));
-char   *gunique __P((char *));
+char   *gunique __P((const char *));
 void	help __P((int, char **));
-char   *hookup __P((char *, int));
+char   *hookup __P((const char *, int));
 void	idle __P((int, char **));
 int     initconn __P((void));
-void	intr __P(());
+void	intr __P((void));
+void	list_vertical __P((StringList *));
 void	lcd __P((int, char **));
-int	login __P((char *));
-void	lostpeer __P(());
+int	login __P((const char *, char *, char *));
+void	lostpeer __P((void));
+void	lpwd __P((int, char **));
 void	ls __P((int, char **));
 void	mabort __P((int));
 void	macdef __P((int, char **));
@@ -87,49 +97,60 @@ void	modtime __P((int, char **));
 void	mput __P((int, char **));
 char   *onoff __P((int));
 void	newer __P((int, char **));
-void	proxabort __P(());
-void    proxtrans __P((char *, char *, char *));
-void    psabort __P(());
+void	page __P((int, char **));
+void    progressmeter __P((int));
+char   *prompt __P((void));
+void	proxabort __P((int));
+void    proxtrans __P((const char *, const char *, const char *));
+void    psabort __P((int));
+void	psummary __P((int));
 void    pswitch __P((int));
-void    ptransfer __P((char *, long, struct timeval *, struct timeval *));
+void    ptransfer __P((int));
 void	put __P((int, char **));
 void	pwd __P((int, char **));
 void	quit __P((int, char **));
 void	quote __P((int, char **));
-void	quote1 __P((char *, int, char **));
-void    recvrequest __P((char *, char *, char *, char *, int));
+void	quote1 __P((const char *, int, char **));
+void    recvrequest __P((const char *, const char *, const char *,
+	    const char *, int));
 void	reget __P((int, char **));
-char   *remglob __P((char **, int));
+char   *remglob __P((char **, int, char **));
+off_t	remotesize __P((const char *, int));
+time_t	remotemodtime __P((const char *, int));
 void	removedir __P((int, char **));
 void	renamefile __P((int, char **));
 void    reset __P((int, char **));
 void	restart __P((int, char **));
 void	rmthelp __P((int, char **));
 void	rmtstatus __P((int, char **));
-int	ruserpass __P((char *, char **, char **, char **));
-void    sendrequest __P((char *, char *, char *, int));
+int	ruserpass __P((const char *, char **, char **, char **));
+void    sendrequest __P((const char *, const char *, const char *, int));
 void	setascii __P((int, char **));
 void	setbell __P((int, char **));
 void	setbinary __P((int, char **));
 void	setcase __P((int, char **));
 void	setcr __P((int, char **));
 void	setdebug __P((int, char **));
+void	setedit __P((int, char **));
 void	setform __P((int, char **));
 void	setftmode __P((int, char **));
 void	setglob __P((int, char **));
 void	sethash __P((int, char **));
 void	setnmap __P((int, char **));
 void	setntrans __P((int, char **));
-void	setpassive __P(());
+void	setpassive __P((int, char **));
 void	setpeer __P((int, char **));
 void	setport __P((int, char **));
+void	setpreserve __P((int, char **));
+void	setprogress __P((int, char **));
 void	setprompt __P((int, char **));
-void	setrestrict __P(());
+void	setrestrict __P((int, char **));
 void	setrunique __P((int, char **));
 void	setstruct __P((int, char **));
 void	setsunique __P((int, char **));
 void	settenex __P((int, char **));
 void	settrace __P((int, char **));
+void	setttywidth __P((int));
 void	settype __P((int, char **));
 void	setverbose __P((int, char **));
 void	shell __P((int, char **));
@@ -138,13 +159,15 @@ void	sizecmd __P((int, char **));
 char   *slurpstring __P((void));
 void	status __P((int, char **));
 void	syst __P((int, char **));
-void    tvsub __P((struct timeval *, struct timeval *, struct timeval *));
+int	togglevar __P((int, char **, int *, const char *));
+void	usage __P((void));
 void	user __P((int, char **));
 
+
 extern jmp_buf	abortprox;
 extern int	abrtflag;
 extern struct	cmd cmdtab[];
-extern FILE	*cout;
+extern FILE    *cout;
 extern int	data;
 extern char    *home;
 extern jmp_buf	jabort;
@@ -152,3 +175,6 @@ extern int	proxy;
 extern char	reply_string[];
 extern off_t	restart_point;
 extern int	NCMDS;
+
+extern char *__progname;		/* from crt0.o */
+