From 9f63f2aa1c1d98abf8a809ebc7eb69ddb29f422e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sun, 8 Nov 1998 23:18:48 +0000
Subject: [PATCH] main.c:  Fix usage string. Fix getopt() string. Fix ordering
 of compatibility options. fetch.1:  Fix synopsis. Fix ordering of T and t
 options. Fix minor grammar nit.

---
 usr.bin/fetch/fetch.1 | 17 +++++++++--------
 usr.bin/fetch/main.c  |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 20be53dd2f69..06a2fc0ae331 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.23 1998/05/09 21:39:49 wollman Exp $
+.\" $Id: fetch.1,v 1.24 1998/09/20 00:01:26 jkh Exp $
 .Dd July 2, 1996
 .Dt FETCH 1
 .Os FreeBSD 2.2
@@ -7,13 +7,14 @@
 .Nd retrieve a file by Uniform Resource Locator
 .Sh SYNOPSIS
 .Nm fetch
-.Op Fl MPabmnpqr
+.Op Fl MPablmnpqrtv
 .Op Fl S Ar size
+.Op Fl T Ar timeout
 .Op Fl o Ar file
 .Ar URL
 .Op Ar ...
 .Nm fetch
-.Op Fl MPRmnpqr
+.Op Fl MPRlmnpqrv
 .Op Fl S Ar size
 .Op Fl o Ar file
 .Op Fl c Ar dir
@@ -102,7 +103,7 @@ under any circumstances, even if the transfer failed or was incomplete.
 .It Fl r
 Restart a previously interrupted transfer.
 .It Fl S Ar bytes
-Require file size reported by 
+Require the file size reported by
 .Tn FTP
 or 
 .Tn HTTP
@@ -114,10 +115,6 @@ This option is useful to prevent
 .Nm fetch
 from downloading a file that is either incomplete or the wrong version,
 given the correct size of the file in advance.
-.It Fl t
-Work around a different set of buggy
-.Tn TCP
-implementations.
 .It Fl T Ar seconds
 Set timeout value to
 .Ar seconds.
@@ -126,6 +123,10 @@ Overrides the environment variables
 for ftp transfers or
 .Ev HTTP_TIMEOUT 
 for http transfers if set.
+.It Fl t
+Work around a different set of buggy
+.Tn TCP
+implementations.
 .It Fl v
 Increase verbosity.  More
 .Fl v Ns \&'s
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 6669ad03be37..0d2e69af1bb3 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: main.c,v 1.46 1998/05/09 08:56:07 des Exp $ */
+/* $Id: main.c,v 1.47 1998/09/20 00:01:26 jkh Exp $ */
 
 #include <sys/types.h>
 
@@ -52,7 +52,7 @@ static void
 usage()
 {
 	fprintf(stderr, "%s\n%s\n", 
-		"usage: fetch [-DHILMNPRTValmnpqrv] [-o outputfile] [-S bytes]",
+		"usage: fetch [-DHILMNPRTVablmnpqrtv] [-o outputfile] [-S bytes]",
 		"             [-f file -h host [-c dir] | URL]");
 	exit(EX_USAGE);
 }
@@ -74,9 +74,9 @@ main(int argc, char *const *argv)
     fs.fs_expectedsize = -1;
     change_to_dir = file_to_get = hostname = 0;
 
-    while ((c = getopt(argc, argv, "abc:D:f:h:HilLmMnNo:pPqRrS:tT:vV:")) != -1) {
+    while ((c = getopt(argc, argv, "abc:D:f:h:HIlLmMnNo:pPqRrS:tT:vV:")) != -1) {
 	    switch (c) {
-	    case 'D': case 'H': case 'I': case 'N': case 'L': case 'V': 
+	    case 'D': case 'H': case 'I': case 'L': case 'N': case 'V': 
 		    break;	/* ncftp compatibility */
 	    
 	    case 'a':