summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-21 02:39:39 +1000
committerDamien Miller <djm@mindrot.org>2013-08-21 02:39:39 +1000
commiteec840673bce3f69ad269672fba7ed8ff05f154f (patch)
tree71648824be297c463215d43219a3bfc49e049888
parent02e878070d0eddad4e11f2c82644b275418eb112 (diff)
- djm@cvs.openbsd.org 2013/08/06 23:05:01
[sftp.1] document top-level -a option (the -a option to 'get' was already documented)
-rw-r--r--ChangeLog4
-rw-r--r--sftp.115
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 913716bb..d7f5a59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
fix some whitespace at EOL
make list of commands an enum rather than a long list of defines
add -a to usage()
+ - djm@cvs.openbsd.org 2013/08/06 23:05:01
+ [sftp.1]
+ document top-level -a option (the -a option to 'get' was already
+ documented)
20130808
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/sftp.1 b/sftp.1
index 2577fe87..e75a81a7 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.92 2013/07/25 00:56:51 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.93 2013/08/06 23:05:01 djm Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 25 2013 $
+.Dd $Mdocdate: August 6 2013 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -31,7 +31,7 @@
.Sh SYNOPSIS
.Nm sftp
.Bk -words
-.Op Fl 1246Cpqrv
+.Op Fl 1246Capqrv
.Op Fl B Ar buffer_size
.Op Fl b Ar batchfile
.Op Fl c Ar cipher
@@ -114,6 +114,11 @@ uses when transferring files.
Larger buffers require fewer round trips at the cost of higher
memory consumption.
The default is 32768 bytes.
+.It Fl a
+Attempt to continue interrupted downloads rather than overwriting existing
+partial or complete copies of files.
+If the remote file contents differ from the partial local copy then the
+resultant file is likely to be corrupt.
.It Fl b Ar batchfile
Batch mode reads a series of commands from an input
.Ar batchfile
@@ -368,8 +373,8 @@ If the
flag is specified, then attempt to resume partial transfers of existing files.
Note that resumption assumes that any partial copy of the local file matches
the remote copy.
-If the remote file differs from the partial local copy then the resultant file
-is likely to be corrupt.
+If the remote file contents differ from the partial local copy then the
+resultant file is likely to be corrupt.
.Pp
If either the
.Fl P