- logan@cvs.openbsd.org 2014/04/22 12:42:04
[sftp.1]
Document sftp upload resume.
OK from djm@, with feedback from okan@.
diff --git a/sftp.1 b/sftp.1
index a700c2a..e73a480 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.97 2013/10/20 09:51:26 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.98 2014/04/22 12:42:04 logan 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: October 20 2013 $
+.Dd $Mdocdate: April 22 2014 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -108,10 +108,10 @@
.Nm
to use IPv6 addresses only.
.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.
+Attempt to continue interrupted transfers rather than overwriting
+existing partial or complete copies of files.
+If the partial contents differ from those being transferred,
+then the resultant file is likely to be corrupt.
.It Fl B Ar buffer_size
Specify the size of the buffer that
.Nm
@@ -134,7 +134,7 @@
.Nm
will abort if any of the following
commands fail:
-.Ic get , put , reget , rename , ln ,
+.Ic get , put , reget , reput, rename , ln ,
.Ic rm , mkdir , chdir , ls ,
.Ic lchdir , chmod , chown ,
.Ic chgrp , lpwd , df , symlink ,
@@ -495,7 +495,7 @@
.It Ic progress
Toggle display of progress meter.
.It Xo Ic put
-.Op Fl fPpr
+.Op Fl afPpr
.Ar local-path
.Op Ar remote-path
.Xc
@@ -515,6 +515,15 @@
must specify a directory.
.Pp
If the
+.Fl a
+flag is specified, then attempt to resume partial
+transfers of existing files.
+Note that resumption assumes that any partial copy of the remote file
+matches the local copy.
+If the local file contents differ from the remote local copy then
+the resultant file is likely to be corrupt.
+.Pp
+If the
.Fl f
flag is specified, then a request will be sent to the server to call
.Xr fsync 2
@@ -552,6 +561,18 @@
with the
.Fl a
flag set.
+.It Xo Ic reput
+.Op Fl Ppr
+.Op Ar local-path
+.Ar remote-path
+.Xc
+Resume upload of
+.Op Ar local-path .
+Equivalent to
+.Ic put
+with the
+.Fl a
+flag set.
.It Ic rename Ar oldpath Ar newpath
Rename remote file from
.Ar oldpath