X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/94b5353c71e7246077d468afe68d51ce85fc213d..dfc80bf956a344dcd185f6db2980af7919c52e0d:/hangman/setup.c

diff --git a/hangman/setup.c b/hangman/setup.c
index 73c835f9..d5979f81 100644
--- a/hangman/setup.c
+++ b/hangman/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.3 1995/03/23 08:32:59 cgd 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.
  *
@@ -33,27 +29,31 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: setup.c,v 1.3 1995/03/23 08:32:59 cgd Exp $";
+__RCSID("$NetBSD: setup.c,v 1.11 2012/06/19 05:45:00 dholland Exp $");
 #endif
-#endif /* not lint */
+#endif				/* not lint */
 
-# include	"hangman.h"
+#include	<err.h>
+#include	<time.h>
+#include	"hangman.h"
 
 /*
  * setup:
  *	Set up the strings on the screen.
  */
-setup()
+void
+setup(void)
 {
-	register char		**sp;
-	static struct stat	sbuf;
+	const char *const *sp;
+	static struct stat sbuf;
 
 	noecho();
-	crmode();
+	cbreak();
 
 	mvaddstr(PROMPTY, PROMPTX, "Guess:");
 	mvaddstr(GUESSY, GUESSX, "Guessed:");
@@ -68,10 +68,9 @@ setup()
 	}
 
 	srand(time(NULL) + getpid());
-	if ((Dict = fopen(_PATH_DICT, "r")) == NULL) {
-		perror(_PATH_DICT);
+	if ((Dict = fopen(Dict_name, "r")) == NULL) {
 		endwin();
-		exit(1);
+		err(1, "fopen %s", Dict_name);
 	}
 	fstat(fileno(Dict), &sbuf);
 	Dict_size = sbuf.st_size;