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 5f753198..295c42ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- djm@cvs.openbsd.org 2013/08/06 23:06:01
[servconf.c]
add cast to avoid format warning; from portable
+ - jmc@cvs.openbsd.org 2013/08/07 06:24:51
+ [sftp.1 sftp.c]
+ sort -a;
20130808
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/sftp.1 b/sftp.1
index e75a81a7..85d64a7f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.93 2013/08/06 23:05:01 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.94 2013/08/07 06:24:51 jmc 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: August 6 2013 $
+.Dd $Mdocdate: August 7 2013 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -31,7 +31,7 @@
.Sh SYNOPSIS
.Nm sftp
.Bk -words
-.Op Fl 1246Capqrv
+.Op Fl 1246aCpqrv
.Op Fl B Ar buffer_size
.Op Fl b Ar batchfile
.Op Fl c Ar cipher
@@ -107,6 +107,11 @@ to use IPv4 addresses only.
Forces
.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.
.It Fl B Ar buffer_size
Specify the size of the buffer that
.Nm
@@ -114,11 +119,6 @@ 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
diff --git a/sftp.c b/sftp.c
index c68fb2cf..4e1a026f 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.149 2013/08/06 23:03:49 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.150 2013/08/07 06:24:51 jmc Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -2118,7 +2118,7 @@ usage(void)
extern char *__progname;
fprintf(stderr,
- "usage: %s [-1246Capqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
+ "usage: %s [-1246aCpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
" [-D sftp_server_path] [-F ssh_config] "
"[-i identity_file] [-l limit]\n"
" [-o ssh_option] [-P port] [-R num_requests] "