summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 13:47:15 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 13:47:15 +1000
commitd875ff78d2b8436807381051de112f0ebf9b9ae1 (patch)
tree6f5080117d6a585797010db5595d27957b1da24a
parentb15cd7bb097fd80dc99520f45290ef775da1ef19 (diff)
- logan@cvs.openbsd.org 2014/04/22 12:42:04
[sftp.1] Document sftp upload resume. OK from djm@, with feedback from okan@.
-rw-r--r--ChangeLog4
-rw-r--r--sftp.137
2 files changed, 33 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ed4bd4f0..6acc22b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 [sftp.c] 15 [sftp.c]
16 Sort the sftp command list. 16 Sort the sftp command list.
17 OK from djm@ 17 OK from djm@
18 - logan@cvs.openbsd.org 2014/04/22 12:42:04
19 [sftp.1]
20 Document sftp upload resume.
21 OK from djm@, with feedback from okan@.
18 22
1920140430 2320140430
20 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already 24 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/sftp.1 b/sftp.1
index a700c2adb..e73a480a9 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.97 2013/10/20 09:51:26 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.98 2014/04/22 12:42:04 logan Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: October 20 2013 $ 25.Dd $Mdocdate: April 22 2014 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -108,10 +108,10 @@ Forces
108.Nm 108.Nm
109to use IPv6 addresses only. 109to use IPv6 addresses only.
110.It Fl a 110.It Fl a
111Attempt to continue interrupted downloads rather than overwriting existing 111Attempt to continue interrupted transfers rather than overwriting
112partial or complete copies of files. 112existing partial or complete copies of files.
113If the remote file contents differ from the partial local copy then the 113If the partial contents differ from those being transferred,
114resultant file is likely to be corrupt. 114then the resultant file is likely to be corrupt.
115.It Fl B Ar buffer_size 115.It Fl B Ar buffer_size
116Specify the size of the buffer that 116Specify the size of the buffer that
117.Nm 117.Nm
@@ -134,7 +134,7 @@ may be used to indicate standard input.
134.Nm 134.Nm
135will abort if any of the following 135will abort if any of the following
136commands fail: 136commands fail:
137.Ic get , put , reget , rename , ln , 137.Ic get , put , reget , reput, rename , ln ,
138.Ic rm , mkdir , chdir , ls , 138.Ic rm , mkdir , chdir , ls ,
139.Ic lchdir , chmod , chown , 139.Ic lchdir , chmod , chown ,
140.Ic chgrp , lpwd , df , symlink , 140.Ic chgrp , lpwd , df , symlink ,
@@ -495,7 +495,7 @@ Create remote directory specified by
495.It Ic progress 495.It Ic progress
496Toggle display of progress meter. 496Toggle display of progress meter.
497.It Xo Ic put 497.It Xo Ic put
498.Op Fl fPpr 498.Op Fl afPpr
499.Ar local-path 499.Ar local-path
500.Op Ar remote-path 500.Op Ar remote-path
501.Xc 501.Xc
@@ -515,6 +515,15 @@ is specified, then
515must specify a directory. 515must specify a directory.
516.Pp 516.Pp
517If the 517If the
518.Fl a
519flag is specified, then attempt to resume partial
520transfers of existing files.
521Note that resumption assumes that any partial copy of the remote file
522matches the local copy.
523If the local file contents differ from the remote local copy then
524the resultant file is likely to be corrupt.
525.Pp
526If the
518.Fl f 527.Fl f
519flag is specified, then a request will be sent to the server to call 528flag is specified, then a request will be sent to the server to call
520.Xr fsync 2 529.Xr fsync 2
@@ -552,6 +561,18 @@ Equivalent to
552with the 561with the
553.Fl a 562.Fl a
554flag set. 563flag set.
564.It Xo Ic reput
565.Op Fl Ppr
566.Op Ar local-path
567.Ar remote-path
568.Xc
569Resume upload of
570.Op Ar local-path .
571Equivalent to
572.Ic put
573with the
574.Fl a
575flag set.
555.It Ic rename Ar oldpath Ar newpath 576.It Ic rename Ar oldpath Ar newpath
556Rename remote file from 577Rename remote file from
557.Ar oldpath 578.Ar oldpath