scp -S patch fix

Kevin Steves
Fri, 01 Sep 2000 11:51:50 -0000

The scp -S patch didn't seem to go in cleanly; here are some fixes
against the 0830 snapshot:

--- scp.c~	Wed Aug 30 01:11:30 2000
+++ scp.c	Fri Sep  1 12:54:14 2000
@@ -262,7 +262,7 @@
 	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':
--- scp.1~	Wed Aug 23 02:46:24 2000
+++ scp.1	Fri Sep  1 13:46:33 2000
@@ -20,6 +20,7 @@
 .Sh SYNOPSIS
 .Nm scp
 .Op Fl pqrvC46
+.Op Fl S Ar ssh
 .Op Fl P Ar port
 .Op Fl c Ar cipher
 .Op Fl i Ar identity_file
@@ -68,11 +69,6 @@
 .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,7 +99,7 @@
 .Fl p
 is already reserved for preserving the times and modes of the file in
 .Xr rcp 1 .
-.It Fl S
+.It Fl S Ar ssh
 Name of program to use for the encrypted connection. The program must
 understand
 .Xr ssh 1