[scp.1 scp.c]
     the ellipsis is not an optional argument; while here, sync the usage
     and synopsis of commands
     lots of good ideas by jmc@
     ok jmc@
This commit is contained in:
Damien Miller 2007-08-08 14:29:58 +10:00
parent 932040285f
commit 647d97b1ab
3 changed files with 12 additions and 6 deletions

View File

@ -4,6 +4,12 @@
[key.c] [key.c]
Delint: remove some unreachable statements, from Bret Lambert. Delint: remove some unreachable statements, from Bret Lambert.
OK markus@ and dtucker@. OK markus@ and dtucker@.
- sobrado@cvs.openbsd.org 2007/08/06 19:16:06
[scp.1 scp.c]
the ellipsis is not an optional argument; while here, sync the usage
and synopsis of commands
lots of good ideas by jmc@
ok jmc@
20070724 20070724
- (tim) [openssh.xml.in] make FMRI match what package scripts use. - (tim) [openssh.xml.in] make FMRI match what package scripts use.
@ -3123,4 +3129,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4716 2007/08/08 04:28:26 djm Exp $ $Id: ChangeLog,v 1.4717 2007/08/08 04:29:58 djm Exp $

6
scp.1
View File

@ -9,9 +9,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" Created: Sun May 7 00:14:37 1995 ylo
.\" .\"
.\" $OpenBSD: scp.1,v 1.41 2007/05/31 19:20:16 jmc Exp $ .\" $OpenBSD: scp.1,v 1.42 2007/08/06 19:16:06 sobrado Exp $
.\" .\"
.Dd $Mdocdate: May 31 2007 $ .Dd $Mdocdate: August 6 2007 $
.Dt SCP 1 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -34,7 +34,7 @@
.Ar host1 No : .Ar host1 No :
.Oc Ns Ar file1 .Oc Ns Ar file1
.Sm on .Sm on
.Op Ar ... .Ar ...
.Sm off .Sm off
.Oo .Oo
.Op Ar user No @ .Op Ar user No @

4
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.159 2007/06/13 00:21:27 djm Exp $ */ /* $OpenBSD: scp.c,v 1.160 2007/08/06 19:16:06 sobrado Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -1120,7 +1120,7 @@ usage(void)
(void) fprintf(stderr, (void) fprintf(stderr,
"usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
" [-l limit] [-o ssh_option] [-P port] [-S program]\n" " [-l limit] [-o ssh_option] [-P port] [-S program]\n"
" [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); " [[user@]host1:]file1 ... [[user@]host2:]file2\n");
exit(1); exit(1);
} }