X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/82852318e37fa7eddacc3dd162a2d16d3a7487b9..5581e4e9051050bf46efbb811992060b98f7e740:/hangman/main.c

diff --git a/hangman/main.c b/hangman/main.c
index 8d448e03..d7c25785 100644
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 1999/09/08 21:45:28 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.15 2012/06/19 05:45:00 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983, 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,27 +31,51 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1983, 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.6 1999/09/08 21:45:28 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2012/06/19 05:45:00 dholland Exp $");
 #endif
 #endif /* not lint */
 
+#include	<err.h>
 #include	"hangman.h"
 
 /*
  * This game written by Ken Arnold.
  */
 int
-main(void)
+main(int argc, char *argv[])
 {
-	initscr();
+	int ch;
+
+	/* Revoke setgid privileges */
+	setgid(getgid());
+
+	while ((ch = getopt(argc, argv, "d:m:")) != -1) {
+		switch (ch) {
+		case 'd':
+			Dict_name = optarg;
+			break;
+		case 'm':
+			Minlen = atoi(optarg);
+			if (Minlen < 2)
+				errx(1, "minimum word length too short");
+			break;
+		case '?':
+		default:
+			(void)fprintf(stderr, "usage: hangman [-d wordlist] [-m minlen]\n");
+			exit(1);
+		}
+	}
+
+	if (!initscr())
+		errx(0, "couldn't initialize screen");
 	signal(SIGINT, die);
 	setup();
 	for (;;) {
@@ -70,8 +90,7 @@ main(void)
  *	Die properly.
  */
 void
-die(dummy)
-	int dummy __attribute__((__unused__));
+die(int dummy __unused)
 {
 	mvcur(0, COLS - 1, LINES - 1, 0);
 	endwin();