Fix merge conflicts

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

diff --git a/hangman/setup.c b/hangman/setup.c
index 4ba9f7dfe588cb55dca9ed8b2571928ffda21f50..d5979f8146e244f62084617fa5fa6d12fa0c4790 100644 (file)
--- a/hangman/setup.c
+++ b/hangman/setup.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: setup.c,v 1.6 1999/09/08 21:17:50 jsm Exp $    */
+/*     $NetBSD: setup.c,v 1.11 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.
  *
@@ -38,11 +34,12 @@
 #if 0
 static char sccsid[] = "@(#)setup.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setup.c,v 1.6 1999/09/08 21:17:50 jsm Exp $");
+__RCSID("$NetBSD: setup.c,v 1.11 2012/06/19 05:45:00 dholland Exp $");
 #endif
 #endif                         /* not lint */
 
 #include       <err.h>
+#include       <time.h>
 #include       "hangman.h"
 
 /*
@@ -50,13 +47,13 @@ __RCSID("$NetBSD: setup.c,v 1.6 1999/09/08 21:17:50 jsm Exp $");
  *     Set up the strings on the screen.
  */
 void
-setup()
+setup(void)
 {
        const char *const *sp;
        static struct stat sbuf;
 
        noecho();
-       crmode();
+       cbreak();
 
        mvaddstr(PROMPTY, PROMPTX, "Guess:");
        mvaddstr(GUESSY, GUESSX, "Guessed:");
@@ -71,9 +68,9 @@ setup()
        }
 
        srand(time(NULL) + getpid());
-       if ((Dict = fopen(_PATH_DICT, "r")) == NULL) {
+       if ((Dict = fopen(Dict_name, "r")) == NULL) {
                endwin();
-               err(1, "fopen %s", _PATH_DICT);
+               err(1, "fopen %s", Dict_name);
        }
        fstat(fileno(Dict), &sbuf);
        Dict_size = sbuf.st_size;