Fix merge conflicts

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

diff --git a/hangman/setup.c b/hangman/setup.c
index d119e7554c5a036e4f8760d7963bde2b26dffc19..d5979f8146e244f62084617fa5fa6d12fa0c4790 100644 (file)
--- a/hangman/setup.c
+++ b/hangman/setup.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: setup.c,v 1.11 2012/06/19 05:45:00 dholland Exp $      */
+
 /*-
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,24 +29,31 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)setup.c    5.4 (Berkeley) 4/8/91";*/
-static char rcsid[] = "$Id: setup.c,v 1.2 1993/08/01 18:54:20 mycroft Exp $";
-#endif /* not lint */
+#if 0
+static char sccsid[] = "@(#)setup.c    8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: setup.c,v 1.11 2012/06/19 05:45:00 dholland Exp $");
+#endif
+#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:");
@@ -63,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;