- deraadt@cvs.openbsd.org 2002/06/17 06:05:56

     [scp.c]
     make usage like man page

diff --git a/ChangeLog b/ChangeLog
index 30b6368a0f26d470a498f29fa7cff85ce873637d..abba4156b63f876f2d6a9d4010bc5785b9d287f5 100644 (file)
--- 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

diff --git a/scp.c b/scp.c
index 860dc108bd2cd72c92b6f69a58396338cc3a66eb..2019376e9c3424d89b42807a532332a70e97de4e 100644 (file)
--- 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);
 }