RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-25 11:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2009/08/13 13:39:54

Browse Source 
[sftp.1 sftp.c]
     sync synopsis and usage();
This commit is contained in:
Darren Tucker 2009-10-07 08:23:44 +11:00
parent 282b4026cb
commit c07138e6f6
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18,6 +18,9 @@
used by our regression scripts. used by our regression scripts.
part of larger patch from carlosvsilvapt@gmail.com for his Google Summer part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
of Code work; ok deraadt markus of Code work; ok deraadt markus
- jmc@cvs.openbsd.org 2009/08/13 13:39:54
[sftp.1 sftp.c]
sync synopsis and usage();
20091002 20091002
- (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.

4
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.72 2009/08/13 01:11:19 djm Exp $ .\" $OpenBSD: sftp.1,v 1.73 2009/08/13 13:39:54 jmc Exp $
.\" .\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\" .\"
@ -37,7 +37,7 @@
.Op Fl c Ar cipher .Op Fl c Ar cipher
.Op Fl D Ar sftp_server_path .Op Fl D Ar sftp_server_path
.Op Fl F Ar ssh_config .Op Fl F Ar ssh_config
.Op Fl i Ar identity_path .Op Fl i Ar identity_file
.Op Fl o Ar ssh_option .Op Fl o Ar ssh_option
.Op Fl P Ar port .Op Fl P Ar port
.Op Fl R Ar num_requests .Op Fl R Ar num_requests

8
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.109 2009/08/13 01:11:19 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.110 2009/08/13 13:39:54 jmc Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1669,8 +1669,10 @@ usage(void)
fprintf(stderr, fprintf(stderr,
"usage: %s [-1246Cqv] [-B buffer_size] [-b batchfile] [-c cipher]\n" "usage: %s [-1246Cqv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
" [-F ssh_config] [-i identify_file] [-o ssh_option]\n" " [-D sftp_server_path] [-F ssh_config] "
" [-P sftp_server_path] [-R num_requests] [-S program]\n" "[-i identity_file]\n"
" [-o ssh_option] [-P port] [-R num_requests] "
"[-S program]\n"
" [-s subsystem | sftp_server] host\n" " [-s subsystem | sftp_server] host\n"
" %s [user@]host[:file ...]\n" " %s [user@]host[:file ...]\n"
" %s [user@]host[:dir[/]]\n" " %s [user@]host[:dir[/]]\n"