From 45933dd9aa7e7e8c9258001d67f2c118c3e026f4 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 21 Jun 2002 00:10:58 +0000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2002/06/17 06:05:56 [scp.c] make usage like man page --- ChangeLog | 7 +++++-- scp.c | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a053d3526..f71b2d030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,7 @@ - markus@cvs.openbsd.org 2002/06/15 00:07:38 [authfd.c authfd.h ssh-add.c ssh-agent.c] fix stupid typo - - markus@cvs.openbsd.org 2002/06/15 01:27:48 + - markus@cvs.openbsd.org 2002/06/15 01:27:48 [authfd.c authfd.h ssh-add.c ssh-agent.c] remove the CONSTRAIN_IDENTITY messages and introduce a new ADD_ID message with contraints instead. contraints can be @@ -20,6 +20,9 @@ - itojun@cvs.openbsd.org 2002/06/16 21:30:58 [ssh-keyscan.c] use TAILQ_xx macro. from lukem@netbsd. markus ok + - deraadt@cvs.openbsd.org 2002/06/17 06:05:56 + [scp.c] + make usage like man page 20020613 - (bal) typo of setgroup for cygwin. Patch by vinschen@redhat.com @@ -948,4 +951,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2222 2002/06/21 00:09:54 mouring Exp $ +$Id: ChangeLog,v 1.2223 2002/06/21 00:10:58 mouring Exp $ diff --git a/scp.c b/scp.c index 860dc108b..2019376e9 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.89 2002/06/08 12:36:53 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.90 2002/06/17 06:05:56 deraadt Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -955,9 +955,9 @@ void usage(void) { (void) fprintf(stderr, - "usage: scp [-pqrvBC46] [-F config] [-S ssh] [-P port] [-c cipher] [-i identity]\n" - " [-o option] f1 f2\n" - " or: scp [options] f1 ... fn directory\n"); + "usage: scp [-pqrvBC46] [-F config] [-S program] [-P port]\n" + " [-c cipher] [-i identity] [-o option]\n" + " [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); exit(1); }