From c689eed5f3c8f366b79fce1445defa6e9a530867 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 5 Jun 2001 21:04:42 +0000
Subject: [PATCH] There is no reason for logname to call getopt(3), it doesn't
 take any options.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR:		26689
Submitted by:	Félix-Antoine Paradis <reel@sympatico.ca>
---
 usr.bin/logname/logname.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index c0f016e612f..30bd41c063c 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -55,18 +57,10 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	int ch;
 	char *p;
 
-	while ((ch = getopt(argc, argv, "")) != -1)
-		switch (ch) {
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
+	if (argc != 1)
+		usage();
 	if ((p = getlogin()) == NULL)
 		err(1, NULL);
 	(void)printf("%s\n", p);