diff options
| author |   jmc <jmc@openbsd.org> | 2013-08-07 06:24:51 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2013-08-07 06:24:51 +0000 |
| commit | 853ad64fd0bdc8a84a874ff2a24121cb52a99e5b (patch) | |
| tree | bb21c61a95ac2f150723b97d8684a1dd8929b406 | |
| parent | document the errors in terms of the actual calls made (mkdtemp/mktemp, (diff) | |
| download | wireguard-openbsd-853ad64fd0bdc8a84a874ff2a24121cb52a99e5b.tar.xz wireguard-openbsd-853ad64fd0bdc8a84a874ff2a24121cb52a99e5b.zip | |
sort -a;
| -rw-r--r-- | usr.bin/ssh/sftp.1 | 16 | ||||
| -rw-r--r-- | usr.bin/ssh/sftp.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1 index e75a81a7027..85d64a7fc73 100644 --- a/usr.bin/ssh/sftp.1 +++ b/usr.bin/ssh/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/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index 969742a41ef..55975ff697c 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/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> * @@ -2077,7 +2077,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] " |