Simplify, little KNF

[bsdgames-darwin.git] / hangman / main.c

diff --git a/hangman/main.c b/hangman/main.c
index 1cc88e78fd2d50a7d4ea001ff4f0296b6b482289..d7c257859514daff43447a77a35d0342e57b67e7 100644 (file)
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.7 1999/09/12 09:02:21 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,30 +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.7 1999/09/12 09:02:21 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[])
 {
+       int ch;
+
        /* Revoke setgid privileges */
-       setregid(getgid(), getgid());
+       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);
+               }
+       }
 
-       initscr();
+       if (!initscr())
+               errx(0, "couldn't initialize screen");
        signal(SIGINT, die);
        setup();
        for (;;) {
@@ -73,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();