X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/93dcff7ea2970754f655050226630589869b3b6d..a8ebb091a7418187b69c5008ac60e7515e9cf803:/trek/main.c

diff --git a/trek/main.c b/trek/main.c
index cfec1a7b..4f8a3b81 100644
--- a/trek/main.c
+++ b/trek/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.10 2001/07/22 13:34:01 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.23 2011/08/29 20:30:37 joerg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,21 +31,20 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1980, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.10 2001/07/22 13:34:01 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.23 2011/08/29 20:30:37 joerg Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <setjmp.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
@@ -58,9 +53,6 @@ __RCSID("$NetBSD: main.c,v 1.10 2001/07/22 13:34:01 wiz Exp $");
 #include "trek.h"
 #include "getpar.h"
 
-# define	PRIO		00	/* default priority */
-
-uid_t	Mother	= 51 + (51 << 8);
 
 /*
 **	 ####  #####    #    ####          #####  ####   #####  #   #
@@ -161,47 +153,27 @@ uid_t	Mother	= 51 + (51 << 8);
 
 jmp_buf env;
 
-int main __P((int, char **));
+__dead static void
+usage(const char *av0)
+{
+	errx(1, "Usage: %s [-fs]", av0);
+}
 
 int
-main(argc, argv)
-int	argc;
-char	**argv;
+main(int argc, char **argv)
 {
-	time_t		curtime;
-	long			vect;
-	char		opencode;
-	int			prio;
-	int		ac;
-	char		**av;
-	struct	termios		argp;
+	int ch;
 
 	/* Revoke setgid privileges */
 	setgid(getgid());
 
-	av = argv;
-	ac = argc;
-	av++;
-	time(&curtime);
-	vect = (long) curtime;
-	srand(vect);
-	opencode = 'w';
-	prio = PRIO;
-
-	if (tcgetattr(1, &argp) == 0)
-	{
-		if (cfgetispeed(&argp) < B1200)
-			Etc.fast++;
-	}
+	/* Default to fast mode */
+	Etc.fast = 1;
 
-	while (ac > 1 && av[0][0] == '-')
-	{
-		switch (av[0][1])
-		{
-		  case 'a':	/* append to log file */
-			opencode = 'a';
-			break;
+	srandom((long) time(NULL));
 
+	while ((ch = getopt(argc, argv, "fst")) != -1) {
+		switch (ch) {
 		  case 'f':	/* set fast mode */
 			Etc.fast++;
 			break;
@@ -210,44 +182,28 @@ char	**argv;
 			Etc.fast = 0;
 			break;
 
-#		ifdef xTRACE
+#ifdef xTRACE
 		  case 't':	/* trace */
-			if (getuid() != Mother)
-				goto badflag;
 			Trace++;
 			break;
-#		endif
-
-		  case 'p':	/* set priority */
-			if (getuid() != Mother)
-				goto badflag;
-			prio = atoi(av[0] + 2);
-			break;
+#endif
 
 		  default:
-		  badflag:
-			printf("Invalid option: %s\n", av[0]);
-
+			usage(argv[0]);
 		}
-		ac--;
-		av++;
 	}
-	if (ac > 2)
-		errx(1, "arg count");
-		/*
-	if (ac > 1)
-		f_log = fopen(av[0], opencode);
-		*/
+	if (optind < argc)
+		usage(argv[0]);
 
-	printf("\n   * * *   S T A R   T R E K   * * *\n\nPress return to continue.\n");
+	printf("\n   * * *   S T A R   T R E K   * * *\n\n"
+	       "Press return to continue.\n");
 
-	if (setjmp(env))
-	{
+	if (setjmp(env)) {
 		if ( !getynpar("Another game") )
 			exit(0);
 	}
-	do
-	{
+
+	do {
 		setup();
 		play();
 	} while (getynpar("Another game"));