===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.1,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/ftp/ftp.1	1998/09/19 20:47:16	1.21
--- src/usr.bin/ftp/ftp.1	1998/09/26 19:54:48	1.22
***************
*** 1,4 ****
! .\" 	$OpenBSD: ftp.1,v 1.21 1998/09/19 20:47:16 millert Exp $
  .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
  .\"
  .\" Copyright (c) 1985, 1989, 1990, 1993
--- 1,4 ----
! .\" 	$OpenBSD: ftp.1,v 1.22 1998/09/26 19:54:48 aaron Exp $
  .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
  .\"
  .\" Copyright (c) 1985, 1989, 1990, 1993
***************
*** 44,64 ****
  file transfer program
  .Sh SYNOPSIS
  .Nm
! .Op Fl A
! .Op Fl a
! .Op Fl d
! .Op Fl e
! .Op Fl g
! .Op Fl i
! .Op Fl m
! .Op Fl n
  .Op Fl o Ar output
- .Op Fl p
  .Op Fl P Ar port
  .Op Fl r Ar seconds
- .Op Fl t
- .Op Fl v
- .Op Fl V
  .Op Ar host Op Ar port
  .Nm ftp
  ftp://[\fIuser\fR:\fIpassword\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
--- 44,53 ----
  file transfer program
  .Sh SYNOPSIS
  .Nm
! .Op Fl AVadegimnptu
  .Op Fl o Ar output
  .Op Fl P Ar port
  .Op Fl r Ar seconds
  .Op Ar host Op Ar port
  .Nm ftp
  ftp://[\fIuser\fR:\fIpassword\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
***************
*** 67,73 ****
  .Nm ftp
  \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
  .Sh DESCRIPTION
! .Nm Ftp
  is the user interface to the
  .Tn ARPANET
  standard File Transfer Protocol.
--- 56,62 ----
  .Nm ftp
  \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
  .Sh DESCRIPTION
! .Nm ftp
  is the user interface to the
  .Tn ARPANET
  standard File Transfer Protocol.
***************
*** 94,100 ****
  .It Fl a
  Causes
  .Nm
! to bypass normal login procedure, and use an anonymous login instead.
  .It Fl d
  Enables debugging.
  .It Fl e
--- 83,89 ----
  .It Fl a
  Causes
  .Nm
! to bypass the normal login procedure and use an anonymous login instead.
  .It Fl d
  Enables debugging.
  .It Fl e
***************
*** 129,138 ****
  .It Fl o Ar output
  When fetching a single file or url, save the contents in
  .Ar output .
! To make the contents go to
! .Ar stdout ,
  use
! .Qq -
  for
  .Ar output .
  .It Fl p
--- 118,126 ----
  .It Fl o Ar output
  When fetching a single file or url, save the contents in
  .Ar output .
! To make the contents go to stdout,
  use
! .Dq -
  for
  .Ar output .
  .It Fl p
***************
*** 175,186 ****
  from the user.
  When
  .Nm
! is awaiting commands from the user the prompt
  .Ql ftp>
  is provided to the user.
  The following commands are recognized
  by
! .Nm ftp  :
  .Bl -tag -width Fl
  .It Ic \&! Op Ar command Op Ar args
  Invoke an interactive shell on the local machine.
--- 163,174 ----
  from the user.
  When
  .Nm
! is awaiting commands the prompt
  .Ql ftp>
  is provided to the user.
  The following commands are recognized
  by
! .Nm ftp :
  .Bl -tag -width Fl
  .It Ic \&! Op Ar command Op Ar args
  Invoke an interactive shell on the local machine.
***************
*** 233,239 ****
  session with the remote server
  and exit
  .Nm ftp .
! An end of file will also terminate the session and exit.
  .It Ic case
  Toggle remote computer file name case mapping during
  .Ic mget
--- 221,227 ----
  session with the remote server
  and exit
  .Nm ftp .
! An end-of-file will also terminate the session and exit.
  .It Ic case
  Toggle remote computer file name case mapping during
  .Ic mget
***************
*** 259,272 ****
  .It Ic close
  Terminate the
  .Tn FTP
! session with the remote server, and
  return to the command interpreter.
  Any defined macros are erased.
  .It Ic \&cr
  Toggle carriage return stripping during
! ascii type file retrieval.
  Records are denoted by a carriage return/linefeed sequence
! during ascii type file transfer.
  When
  .Ic \&cr
  is on (the default), carriage returns are stripped from this
--- 247,260 ----
  .It Ic close
  Terminate the
  .Tn FTP
! session with the remote server and
  return to the command interpreter.
  Any defined macros are erased.
  .It Ic \&cr
  Toggle carriage return stripping during
! ASCII type file retrieval.
  Records are denoted by a carriage return/linefeed sequence
! during ASCII type file transfer.
  When
  .Ic \&cr
  is on (the default), carriage returns are stripped from this
***************
*** 277,283 ****
  Records on
  .Pf non\- Ns Ux
  remote systems may contain single linefeeds;
! when an ascii type transfer is made, these linefeeds may be
  distinguished from a record delimiter only when
  .Ic \&cr
  is off.
--- 265,271 ----
  Records on
  .Pf non\- Ns Ux
  remote systems may contain single linefeeds;
! when an ASCII type transfer is made, these linefeeds may be
  distinguished from a record delimiter only when
  .Ic \&cr
  is off.
***************
*** 399,405 ****
  different from expansion of the name of an ordinary file:
  the exact result depends on the foreign operating system and ftp server,
  and can be previewed by doing
! .Ql mls remote-files \-
  Note:
  .Ic mget
  and
--- 387,393 ----
  different from expansion of the name of an ordinary file:
  the exact result depends on the foreign operating system and ftp server,
  and can be previewed by doing
! .Dq mls remote-files \- .
  Note:
  .Ic mget
  and
***************
*** 473,479 ****
  The macro processor interprets `$' and `\e' as special characters.
  A `$' followed by a number (or numbers) is replaced by the
  corresponding argument on the macro invocation command line.
! A `$' followed by an `i' signals that macro processor that the
  executing macro is to be looped.
  On the first pass `$i' is
  replaced by the first argument on the macro invocation command line,
--- 461,467 ----
  The macro processor interprets `$' and `\e' as special characters.
  A `$' followed by a number (or numbers) is replaced by the
  corresponding argument on the macro invocation command line.
! A `$' followed by an `i' tells the macro processor that the
  executing macro is to be looped.
  On the first pass `$i' is
  replaced by the first argument on the macro invocation command line,
***************
*** 559,565 ****
  .Ic mput .
  .It Ic newer Ar file-name
  Get the file only if the modification time of the remote file is more
! recent that the file on the current system.
  If the file does not
  exist on the current system, the remote file is considered
  .Ic newer .
--- 547,553 ----
  .Ic mput .
  .It Ic newer Ar file-name
  Get the file only if the modification time of the remote file is more
! recent than the file on the current system.
  If the file does not
  exist on the current system, the remote file is considered
  .Ic newer .
***************
*** 589,595 ****
  .Ar inpattern
  and
  .Ar outpattern .
! .Op Ar Inpattern
  is a template for incoming filenames (which may have already been
  processed according to the
  .Ic ntrans
--- 577,583 ----
  .Ar inpattern
  and
  .Ar outpattern .
! .Ar inpattern
  is a template for incoming filenames (which may have already been
  processed according to the
  .Ic ntrans
***************
*** 602,608 ****
  Use `\\' to prevent this special treatment of the `$' character.
  All other characters are treated literally, and are used to determine the
  .Ic nmap
! .Op Ar inpattern
  variable values.
  For example, given
  .Ar inpattern
--- 590,596 ----
  Use `\\' to prevent this special treatment of the `$' character.
  All other characters are treated literally, and are used to determine the
  .Ic nmap
! .Ar inpattern
  variable values.
  For example, given
  .Ar inpattern
***************
*** 615,621 ****
  from the
  .Ar inpattern
  template.
! The sequence `$0' is replace by the original filename.
  Additionally, the sequence
  .Ql Op Ar seq1 , Ar seq2
  is replaced by
--- 603,609 ----
  from the
  .Ar inpattern
  template.
! The sequence `$0' is replaced by the original filename.
  Additionally, the sequence
  .Ql Op Ar seq1 , Ar seq2
  is replaced by
***************
*** 673,680 ****
  .Ar host
  .Tn FTP
  server.
! An optional port number may be supplied,
! in which case,
  .Nm
  will attempt to contact an
  .Tn FTP
--- 661,668 ----
  .Ar host
  .Tn FTP
  server.
! An optional port number may be supplied
! in which case
  .Nm
  will attempt to contact an
  .Tn FTP
***************
*** 747,767 ****
  Do not transfer the file.
  .It Ic a
  Answer
! .Sq yes
! to the current file, and automatically answer
! .Sq yes
  to any remaining files for the current command.
  .It Ic p
  Answer
! .Sq yes
! to the current file, and turn off prompt mode
! (as is
  .Dq prompt off
  had been given).
  .El
  .Pp
  Any other reponse will answer
! .Sq yes
  to the current file.
  .It Ic proxy Ar ftp-command
  Execute an ftp command on a secondary control connection.
--- 735,755 ----
  Do not transfer the file.
  .It Ic a
  Answer
! .Dq yes
! to the current file and automatically answer
! .Dq yes
  to any remaining files for the current command.
  .It Ic p
  Answer
! .Dq yes
! to the current file and turn off prompt mode
! (as if
  .Dq prompt off
  had been given).
  .El
  .Pp
  Any other reponse will answer
! .Dq yes
  to the current file.
  .It Ic proxy Ar ftp-command
  Execute an ftp command on a secondary control connection.
***************
*** 857,863 ****
  .It Ic rename Op Ar from Op Ar to
  Rename the file
  .Ar from
! on the remote machine, to the file
  .Ar to .
  .It Ic reset
  Clear reply queue.
--- 845,851 ----
  .It Ic rename Op Ar from Op Ar to
  Rename the file
  .Ar from
! on the remote machine to the file
  .Ar to .
  .It Ic reset
  Clear reply queue.
***************
*** 875,881 ****
  .Ar marker .
  On
  .Ux
! systems, marker is usually a byte
  offset into the file.
  .It Ic rmdir Ar directory-name
  Delete a directory on the remote machine.
--- 863,871 ----
  .Ar marker .
  On
  .Ux
! systems,
! .Ar marker
! is usually a byte
  offset into the file.
  .It Ic rmdir Ar directory-name
  Delete a directory on the remote machine.
***************
*** 1119,1125 ****
  To abort a file transfer, use the terminal interrupt key
  (usually Ctrl-C).
  Sending transfers will be immediately halted.
! Receiving transfers will be halted by sending a ftp protocol
  .Dv ABOR
  command to the remote server, and discarding any further data received.
  The speed at which this is accomplished depends upon the remote
--- 1109,1115 ----
  To abort a file transfer, use the terminal interrupt key
  (usually Ctrl-C).
  Sending transfers will be immediately halted.
! Receiving transfers will be halted by sending an ftp protocol
  .Dv ABOR
  command to the remote server, and discarding any further data received.
  The speed at which this is accomplished depends upon the remote
***************
*** 1151,1160 ****
  .It
  If the file name
  .Sq Fl
! is specified, the
! .Ar stdin
! (for reading) or
! .Ar stdout
  (for writing) is used.
  .It
  If the first character of the file name is
--- 1141,1148 ----
  .It
  If the file name
  .Sq Fl
! is specified, the stdin
! (for reading) or stdout
  (for writing) is used.
  .It
  If the first character of the file name is
***************
*** 1365,1371 ****
  By default, this is bound to the TAB key.
  .Sh ENVIRONMENT
  .Nm
! utilizes the following environment variables.
  .Bl -tag -width "FTPSERVERPORT"
  .It Ev FTPMODE
  Overrides the default operation mode.  Recognized values are:
--- 1353,1359 ----
  By default, this is bound to the TAB key.
  .Sh ENVIRONMENT
  .Nm
! utilizes the following environment variables:
  .Bl -tag -width "FTPSERVERPORT"
  .It Ev FTPMODE
  Overrides the default operation mode.  Recognized values are:
***************
*** 1426,1435 ****
  An error in the treatment of carriage returns
  in the
  .Bx 4.2
! ascii-mode transfer code
  has been corrected.
  This correction may result in incorrect transfers of binary files
  to and from
  .Bx 4.2
! servers using the ascii type.
  Avoid this problem by using the binary image type.
--- 1414,1423 ----
  An error in the treatment of carriage returns
  in the
  .Bx 4.2
! ASCII-mode transfer code
  has been corrected.
  This correction may result in incorrect transfers of binary files
  to and from
  .Bx 4.2
! servers using the ASCII type.
  Avoid this problem by using the binary image type.