summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-29 00:43:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-29 00:43:54 +0000
commitff2618c80fdabba2a667c261426b05ce750ee6f1 (patch)
treeb6da7e1035a72bfb324ac54c1afec0a411d02b2f
parentbd47226987a76f6fd704d94bcc90d81b1bece205 (diff)
- stevesk@cvs.openbsd.org 2001/03/28 20:04:38
[scp.c] usage more like rcp and add missing -B to usage; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--scp.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14d0d1301..33ae9b876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - stevesk@cvs.openbsd.org 2001/03/28 19:56:23 23 - stevesk@cvs.openbsd.org 2001/03/28 19:56:23
24 [scp.c] 24 [scp.c]
25 start to sync scp closer to rcp; ok markus@ 25 start to sync scp closer to rcp; ok markus@
26 - stevesk@cvs.openbsd.org 2001/03/28 20:04:38
27 [scp.c]
28 usage more like rcp and add missing -B to usage; ok markus@
26 29
2720010328 3020010328
28 - (djm) Reorder tests and library inclusion for Krb4/AFS to try to 31 - (djm) Reorder tests and library inclusion for Krb4/AFS to try to
@@ -4761,4 +4764,4 @@
4761 - Wrote replacements for strlcpy and mkdtemp 4764 - Wrote replacements for strlcpy and mkdtemp
4762 - Released 1.0pre1 4765 - Released 1.0pre1
4763 4766
4764$Id: ChangeLog,v 1.1032 2001/03/29 00:39:55 mouring Exp $ 4767$Id: ChangeLog,v 1.1033 2001/03/29 00:43:54 mouring Exp $
diff --git a/scp.c b/scp.c
index 0e510480c..bd2c5c751 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.63 2001/03/28 19:56:23 stevesk Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.64 2001/03/28 20:04:38 stevesk Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -966,8 +966,8 @@ void
966usage() 966usage()
967{ 967{
968 (void) fprintf(stderr, "usage: scp " 968 (void) fprintf(stderr, "usage: scp "
969 "[-pqrvC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2; or:\n" 969 "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n"
970 " scp [options] f1 ... fn directory\n"); 970 " or: scp [options] f1 ... fn directory\n");
971 exit(1); 971 exit(1);
972} 972}
973 973