summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/scp.115
-rw-r--r--usr.bin/ssh/scp.c4
2 files changed, 8 insertions, 11 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index d876c5f5550..4ef3fe5d790 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $Id: scp.1,v 1.9 2000/08/19 02:26:08 deraadt Exp $
+.\" $Id: scp.1,v 1.10 2000/09/01 15:25:13 deraadt Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -20,6 +20,7 @@
.Sh SYNOPSIS
.Nm scp
.Op Fl pqrvC46
+.Op Fl S Ar program
.Op Fl P Ar port
.Op Fl c Ar cipher
.Op Fl i Ar identity_file
@@ -68,11 +69,6 @@ This option is directly passed to
.It Fl p
Preserves modification times, access times, and modes from the
original file.
-.It Fl S
-Name of program to use for the encrypted connection.
-The program must understand
-.Xr ssh 1
-options.
.It Fl r
Recursively copy entire directories.
.It Fl v
@@ -103,9 +99,10 @@ because
.Fl p
is already reserved for preserving the times and modes of the file in
.Xr rcp 1 .
-.It Fl S
-Name of program to use for the encrypted connection. The program must
-understand
+.It Fl S Ar program
+Name of
+.Ar program
+to use for the encrypted connection. The program must understand
.Xr ssh 1
options.
.It Fl 4
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 8f8ebb8742b..19f506273a5 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -47,7 +47,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.36 2000/08/24 21:46:59 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.37 2000/09/01 15:25:13 deraadt Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -254,7 +254,7 @@ main(argc, argv)
extern int optind;
fflag = tflag = 0;
- while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF)
+ while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:")) != EOF)
switch (ch) {
/* User-visible flags. */
case '4':