[src/netbsd-1-4]: src/usr.bin/ftp pullup 1.36->1.40 (lukem)

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

details:   https://anonhg.NetBSD.org/src/rev/7b25950e3e87
branches:  netbsd-1-4
changeset: 468904:7b25950e3e87
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Jun 22 21:02:15 1999 +0000

description:
pullup 1.36->1.40 (lukem)

diffstat:

 usr.bin/ftp/ftp.1 |  132 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 91 insertions(+), 41 deletions(-)

diffs (259 lines):

diff -r 5edc6bc3a5c8 -r 7b25950e3e87 usr.bin/ftp/ftp.1
--- a/usr.bin/ftp/ftp.1 Tue Jun 22 21:01:48 1999 +0000
+++ b/usr.bin/ftp/ftp.1 Tue Jun 22 21:02:15 1999 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ftp.1,v 1.36 1999/03/22 07:36:40 lukem Exp $
+.\"    $NetBSD: ftp.1,v 1.36.2.1 1999/06/22 21:02:15 perry Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .\"    @(#)ftp.1       8.3 (Berkeley) 10/9/94
 .\"
-.Dd March 22, 1999
+.Dd June 2, 1999
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -77,19 +77,19 @@
 .Bk -words
 .Op Fl o Ar output
 .Ek
-ftp://[\fIuser\fR[:\fIpassword]\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
+ftp://[\fIuser\fR[:\fIpassword\fR]@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
+.Nm ftp
+.Op Fl f
+.Bk -words
+.Op Fl o Ar output
+.Ek
+http://[\fIuser\fR[:\fIpassword\fR]@]\fIhost\fR[:\fIport\fR]/\fIfile\fR
 .Nm ftp
 .Op Fl f
 .Op Fl R
 .Bk -words
 .Op Fl o Ar output
 .Ek
-http://\fIhost\fR[:\fIport\fR]/\fIfile\fR
-.Nm ftp
-.Op Fl f
-.Bk -words
-.Op Fl o Ar output
-.Ek
 \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
 .Sh DESCRIPTION
 .Nm
@@ -388,7 +388,8 @@
 .Ic form
 to
 .Ar format .
-The default format is \*(Lqfile\*(Rq.
+The default format is
+.Dq file .
 .It Ic get Ar remote-file Op Ar local-file
 Retrieve the
 .Ar remote-file
@@ -410,7 +411,8 @@
 .Ic structure
 are used while transferring the file.
 .It Ic gate Op Ar host Op Ar port
-Toggle gate-ftp mode.
+Toggle gate-ftp mode, which used to connect through the
+TIS FWTK and Gauntlet ftp proxies.
 This will not be permitted if the gate-ftp server hasn't been set
 (either explicitly by the user, or from the
 .Ev FTPSERVER
@@ -588,7 +590,9 @@
 .Ic mode
 to
 .Ar mode-name .
-The default mode is \*(Lqstream\*(Rq mode.
+The default mode is
+.Dq stream
+mode.
 .It Ic modtime Ar file-name
 Show the last modification time of the file on the remote machine.
 .It Ic more Ar file
@@ -1005,7 +1009,9 @@
 .Ar structure
 to
 .Ar struct-name .
-By default \*(Lqstream\*(Rq structure is used.
+By default
+.Dq stream
+structure is used.
 .It Ic sunique
 Toggle storing of files on remote machine under unique file names.
 Remote ftp server must support ftp protocol
@@ -1064,9 +1070,9 @@
 for logging in.
 Unless
 .Nm
-is invoked with \*(Lqauto-login\*(Rq disabled, this
-process is done automatically on initial connection to
-the
+is invoked with
+.Dq auto-login
+disabled, this process is done automatically on initial connection to the
 .Tn FTP
 server.
 .It Ic verbose
@@ -1116,8 +1122,26 @@
 .Bl -tag -width "FOO "
 .It host:/file
 .Dq Classic
-ftp format
-.It ftp://[user[:password]@]host[:port]/file
+ftp format.
+.Pp
+If
+.Ic file
+contains a glob character and globbing is enabled,
+(see
+.Ic glob ) ,
+then the equivalent of
+.Ic "mget file"
+is performed.
+.Pp
+If the directory component of
+.Ic file
+contains no globbing characters,
+it is stored in the current directory as the
+.Xr basename 1
+of
+.Ic file .
+Otherwise, the remote name is used as the local name.
+.It ftp://[user[:password]@]host[:port]/file[;type=X]
 An ftp URL, retrieved using the ftp protocol if
 .Ev ftp_proxy
 isn't defined.
@@ -1159,15 +1183,36 @@
 .Sq mypass ,
 use
 .Dq ftp://myname:mypass@localhost/%2fetc/motd
-.It http://host[:port]/file
+.Pp
+If a suffix of
+.Sq ;type=A
+or
+.Sq ;type=I
+is supplied, then the transfer type will take place as
+ascii or binary (respectively).
+The default transfer type is binary.
+.It http://[user[:password]@]host[:port]/file
 An HTTP URL, retrieved using the HTTP protocol.
 If
 .Ev http_proxy
 is defined, it is used as a URL to an HTTP proxy server.
+If HTTP authorisation is required to retrieve the file,
+and
+.Sq user
+(and optionally
+.Sq password )
+is in the URL, use them for the first attempt to authenticate.
 .It file:///file
 A local URL, copied from /file.
 .El
 .Pp
+Unless noted otherwise above, and
+.Fl o Ar output
+is not given, the file is stored in the current directory as the
+.Xr basename 1
+of
+.Ic file .
+.Pp
 If a classic format or a ftp URL format has a trailing
 .Sq / ,
 then
@@ -1187,23 +1232,8 @@
 instead of
 .Nm get .
 .Pp
-If
-.Ic file
-contains a glob character and globbing is enabled,
-(see
-.Ic glob ) ,
-then the equivalent of
-.Ic "mget file"
-is performed.
-.Pp
-If the directory component of
-.Ic file
-contains no globbing characters,
-it is stored in the current directory as the
-.Xr basename 1
-of
-.Ic file .
-Otherwise, the remote name is used as the local name.
+If WWW or proxy WWW authentication is required, you will be prompted
+to enter a username and password to authenticate with.
 .Sh ABORTING A FILE TRANSFER
 To abort a file transfer, use the terminal interrupt key
 (usually Ctrl-C).
@@ -1257,9 +1287,10 @@
 (stdin).
 If the shell command includes spaces, the argument
 must be quoted; e.g.
-\*(Lq" ls -lt"\*(Rq.
+.Dq Qq Li \ ls\ \-lt .
 A particularly
-useful example of this mechanism is: \*(Lqdir \&|more\*(Rq.
+useful example of this mechanism is:
+.Dq Li dir \&|more .
 .It
 Failing the above checks, if ``globbing'' is enabled,
 local file names are expanded
@@ -1308,8 +1339,14 @@
 affect a file transfer.
 The
 .Ic type
-may be one of \*(Lqascii\*(Rq, \*(Lqimage\*(Rq (binary),
-\*(Lqebcdic\*(Rq, and \*(Lqlocal byte size\*(Rq (for
+may be one of
+.Dq ascii ,
+.Dq image
+(binary),
+.Dq ebcdic ,
+and
+.Dq local byte size
+(for
 .Tn PDP Ns -10's
 and
 .Tn PDP Ns -20's
@@ -1493,6 +1530,8 @@
 Used by
 .Ic page
 to display files.
+(Defaults to
+.Xr more 1 ).
 .It Ev SHELL
 For default shell.
 .It Ev ftp_proxy
@@ -1500,6 +1539,15 @@
 (if not defined, use the standard ftp protocol).
 .It Ev http_proxy
 URL of HTTP proxy to use when making HTTP URL requests.
+If proxy authentication is required and there is a username and
+password in this URL, they will automatically be used in the first
+attempt to authenticate to the proxy.
+.Pp
+Note that the use of a username and password in
+.Ev http_proxy
+may be incompatible with other programs that use it
+(such as
+.Xr lynx 1 ).
 .It Ev no_proxy
 A space or comma separated list of hosts (or domains) for which
 proxying is not to be used.
@@ -1530,7 +1578,9 @@
 fetching of files and URLs, and modification time
 preservation were implemented in
 .Nx 1.3
-by Luke Mewburn, with assistance from Jason Thorpe.
+(and later releases)
+by Luke Mewburn,
+with the original code for HTTP retrieval supplied by Jason Thorpe.
 .Sh BUGS
 Correct execution of many commands depends upon proper behavior
 by the remote server.