[2.2.0p1] patch to get "scp -S prog" to work right + man page fix

[Charles Levert]

Hi.

This functionality was just added in 2.2.0p1.  The patch is self-explanatory.


Charles


--- scp.c.orig-2.2.0p1	Tue Aug 29 19:11:30 2000
+++ scp.c	Sat Sep  2 15:14:58 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.orig-2.2.0p1	Tue Aug 22 20:46:24 2000
+++ scp.1	Sat Sep  2 15:18:00 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,7 +69,7 @@
 .It Fl p
 Preserves modification times, access times, and modes from the
 original file.
-.It Fl S
+.It Fl S Ar ssh
 Name of program to use for the encrypted connection.
 The program must understand
 .Xr ssh 1