tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2013/08/07 06:24:51

Browse Source 
[sftp.1 sftp.c]
     sort -a;
This commit is contained in:
Damien Miller 2013-08-21 02:40:21 +10:00
parent a6d6c1f38a
commit c6895c5c67
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
- djm@cvs.openbsd.org 2013/08/06 23:06:01 - djm@cvs.openbsd.org 2013/08/06 23:06:01
[servconf.c] [servconf.c]
add cast to avoid format warning; from portable 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 20130808
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt

16
sftp.1
View File

@ -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. .\" 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 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: August 6 2013 $ .Dd $Mdocdate: August 7 2013 $
.Dt SFTP 1 .Dt SFTP 1
.Os .Os
.Sh NAME .Sh NAME
@ -31,7 +31,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm sftp .Nm sftp
.Bk -words .Bk -words
.Op Fl 1246Capqrv .Op Fl 1246aCpqrv
.Op Fl B Ar buffer_size .Op Fl B Ar buffer_size
.Op Fl b Ar batchfile .Op Fl b Ar batchfile
.Op Fl c Ar cipher .Op Fl c Ar cipher
@ -107,6 +107,11 @@ to use IPv4 addresses only.
Forces Forces
.Nm .Nm
to use IPv6 addresses only. 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 .It Fl B Ar buffer_size
Specify the size of the buffer that Specify the size of the buffer that
.Nm .Nm
@ -114,11 +119,6 @@ uses when transferring files.
Larger buffers require fewer round trips at the cost of higher Larger buffers require fewer round trips at the cost of higher
memory consumption. memory consumption.
The default is 32768 bytes. 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 .It Fl b Ar batchfile
Batch mode reads a series of commands from an input Batch mode reads a series of commands from an input
.Ar batchfile .Ar batchfile

4
sftp.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -2118,7 +2118,7 @@ usage(void)
extern char *__progname; extern char *__progname;
fprintf(stderr, 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] " " [-D sftp_server_path] [-F ssh_config] "
"[-i identity_file] [-l limit]\n" "[-i identity_file] [-l limit]\n"
" [-o ssh_option] [-P port] [-R num_requests] " " [-o ssh_option] [-P port] [-R num_requests] "