summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-21 02:40:21 +1000
committerDamien Miller <djm@mindrot.org>2013-08-21 02:40:21 +1000
commitc6895c5c67492144dd28589e5788f783be9152ed (patch)
treed16cb5fb7f9bca434ae2eae0bef9df55ee5be704
parenta6d6c1f38ac9b4a5e1bd4df889e1020a8370ed55 (diff)
- jmc@cvs.openbsd.org 2013/08/07 06:24:51
[sftp.1 sftp.c] sort -a;
-rw-r--r--ChangeLog3
-rw-r--r--sftp.116
-rw-r--r--sftp.c4
3 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f753198a..295c42abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - djm@cvs.openbsd.org 2013/08/06 23:06:01 12 - djm@cvs.openbsd.org 2013/08/06 23:06:01
13 [servconf.c] 13 [servconf.c]
14 add cast to avoid format warning; from portable 14 add cast to avoid format warning; from portable
15 - jmc@cvs.openbsd.org 2013/08/07 06:24:51
16 [sftp.1 sftp.c]
17 sort -a;
15 18
1620130808 1920130808
17 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt 20 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/sftp.1 b/sftp.1
index e75a81a70..85d64a7fc 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.93 2013/08/06 23:05:01 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.94 2013/08/07 06:24:51 jmc 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: August 6 2013 $ 25.Dd $Mdocdate: August 7 2013 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -31,7 +31,7 @@
31.Sh SYNOPSIS 31.Sh SYNOPSIS
32.Nm sftp 32.Nm sftp
33.Bk -words 33.Bk -words
34.Op Fl 1246Capqrv 34.Op Fl 1246aCpqrv
35.Op Fl B Ar buffer_size 35.Op Fl B Ar buffer_size
36.Op Fl b Ar batchfile 36.Op Fl b Ar batchfile
37.Op Fl c Ar cipher 37.Op Fl c Ar cipher
@@ -107,6 +107,11 @@ to use IPv4 addresses only.
107Forces 107Forces
108.Nm 108.Nm
109to use IPv6 addresses only. 109to use IPv6 addresses only.
110.It Fl a
111Attempt to continue interrupted downloads rather than overwriting existing
112partial or complete copies of files.
113If the remote file contents differ from the partial local copy then the
114resultant file is likely to be corrupt.
110.It Fl B Ar buffer_size 115.It Fl B Ar buffer_size
111Specify the size of the buffer that 116Specify the size of the buffer that
112.Nm 117.Nm
@@ -114,11 +119,6 @@ uses when transferring files.
114Larger buffers require fewer round trips at the cost of higher 119Larger buffers require fewer round trips at the cost of higher
115memory consumption. 120memory consumption.
116The default is 32768 bytes. 121The default is 32768 bytes.
117.It Fl a
118Attempt to continue interrupted downloads rather than overwriting existing
119partial or complete copies of files.
120If the remote file contents differ from the partial local copy then the
121resultant file is likely to be corrupt.
122.It Fl b Ar batchfile 122.It Fl b Ar batchfile
123Batch mode reads a series of commands from an input 123Batch mode reads a series of commands from an input
124.Ar batchfile 124.Ar batchfile
diff --git a/sftp.c b/sftp.c
index c68fb2cf0..4e1a026f7 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.149 2013/08/06 23:03:49 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.150 2013/08/07 06:24:51 jmc Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -2118,7 +2118,7 @@ usage(void)
2118 extern char *__progname; 2118 extern char *__progname;
2119 2119
2120 fprintf(stderr, 2120 fprintf(stderr,
2121 "usage: %s [-1246Capqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" 2121 "usage: %s [-1246aCpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
2122 " [-D sftp_server_path] [-F ssh_config] " 2122 " [-D sftp_server_path] [-F ssh_config] "
2123 "[-i identity_file] [-l limit]\n" 2123 "[-i identity_file] [-l limit]\n"
2124 " [-o ssh_option] [-P port] [-R num_requests] " 2124 " [-o ssh_option] [-P port] [-R num_requests] "