From fc8308de88c0682761754301e60f4389dd73e87b Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Fri, 24 Apr 1998 20:15:43 +0000
Subject: [PATCH] Remove the bogus -? option after reading the getopt() manual
 :)

---
 bin/ls/ls.1   | 6 ++----
 bin/ls/ls.c   | 4 ++--
 bin/ls/util.c | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index c930c0903cae..5b46031cb9e6 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\"	$Id: ls.1,v 1.18 1998/04/24 07:49:46 des Exp $
+.\"	$Id: ls.1,v 1.19 1998/04/24 12:43:26 des Exp $
 .\"
 .Dd July 29, 1994
 .Dt LS 1
@@ -43,7 +43,7 @@
 .Nd list directory contents
 .Sh SYNOPSIS
 .Nm ls
-.Op Fl ?ABCFHLPRTWabcdfgikloqrstu1
+.Op Fl ABCFHLPRTWabcdfgikloqrstu1
 .Op Ar file ...
 .Sh DESCRIPTION
 For each operand that names a
@@ -70,8 +70,6 @@ lexicographical order.
 .Pp
 The following options are available:
 .Bl -tag -width indent
-.It Fl ?
-Displays a short list of valid options.
 .It Fl A
 List all entries except for
 .Ql \&.
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 5a6561dc6f95..82ba154e269f 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: ls.c,v 1.19 1998/04/24 07:49:47 des Exp $";
+	"$Id: ls.c,v 1.20 1998/04/24 12:43:26 des Exp $";
 #endif
 #endif /* not lint */
 
@@ -135,7 +135,7 @@ main(argc, argv)
 		f_listdot = 1;
 
 	fts_options = FTS_PHYSICAL;
-	while ((ch = getopt(argc, argv, "?1ABCFHLPRTWabcdfgikloqrstu")) != -1) {
+	while ((ch = getopt(argc, argv, "1ABCFHLPRTWabcdfgikloqrstu")) != -1) {
 		switch (ch) {
 		/*
 		 * The -1, -C and -l options all override each other so shell
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 3d16088f2619..22af4f46efce 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.13 1998/04/24 07:49:51 des Exp $";
+	"$Id: util.c,v 1.14 1998/04/24 12:43:26 des Exp $";
 #endif
 #endif /* not lint */
 
@@ -158,7 +158,7 @@ prn_octal(s)
 void
 usage()
 {
-	(void)fprintf(stderr, "usage: ls [-?ACFHLPRTWacdfgikloqrstu1]"
+	(void)fprintf(stderr, "usage: ls [-ACFHLPRTWacdfgikloqrstu1]"
 		      " [file ...]\n");
 	exit(1);
 }