diff options
| author |   djm <djm@openbsd.org> | 2008-12-09 03:02:37 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-12-09 03:02:37 +0000 |
| commit | 3b774b81840973810b6a33c0041e0dd984646bb9 (patch) | |
| tree | 1a6c3abe33a8a25eba6ee287689a4a818902df4a | |
| parent | don't leave junk (free'd) pointers around in Forward *fwd argument on (diff) | |
| download | wireguard-openbsd-3b774b81840973810b6a33c0041e0dd984646bb9.tar.xz wireguard-openbsd-3b774b81840973810b6a33c0041e0dd984646bb9.zip | |
correct sftp(1) and corresponding usage syntax;
bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@
| -rw-r--r-- | usr.bin/ssh/sftp.1 | 13 | ||||
| -rw-r--r-- | usr.bin/ssh/sftp.c | 6 |
2 files changed, 9 insertions, 10 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1 index b4f9a688455..c44564a296e 100644 --- a/usr.bin/ssh/sftp.1 +++ b/usr.bin/ssh/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.67 2008/07/15 02:23:14 djm Exp $ +.\" $OpenBSD: sftp.1,v 1.68 2008/12/09 03:02:37 djm 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: July 15 2008 $ +.Dd $Mdocdate: December 9 2008 $ .Dt SFTP 1 .Os .Sh NAME @@ -43,13 +43,12 @@ .Ar host .Ek .Nm sftp -.Oo Oo Ar user Ns @ Oc Ns -.Ar host Ns Oo : Ns Ar file Oo -.Ar file Oc Oc Oc +.Oo Ar user Ns @ Oc Ns +.Ar host Ns Op : Ns Ar .Nm sftp -.Oo Oo Ar user Ns @ Oc Ns +.Oo Ar user Ns @ Oc Ns .Ar host Ns Oo : Ns Ar dir Ns -.Oo Ar / Oc Oc Oc +.Oo Ar / Oc Oc .Nm sftp .Fl b Ar batchfile .Oo Ar user Ns @ Oc Ns Ar host diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index 6c8e814f501..24c720210c2 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.104 2008/12/09 02:39:59 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.105 2008/12/09 03:04:39 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -1624,8 +1624,8 @@ usage(void) "usage: %s [-1Cv] [-B buffer_size] [-b batchfile] [-F ssh_config]\n" " [-o ssh_option] [-P sftp_server_path] [-R num_requests]\n" " [-S program] [-s subsystem | sftp_server] host\n" - " %s [[user@]host[:file [file]]]\n" - " %s [[user@]host[:dir[/]]]\n" + " %s [user@]host[:file ...]\n" + " %s [user@]host[:dir[/]]\n" " %s -b batchfile [user@]host\n", __progname, __progname, __progname, __progname); exit(1); } |