Fix merge conflicts

[bsdgames-darwin.git] / mille / mille.c

diff --git a/mille/mille.c b/mille/mille.c
index 9991c5003e001fb1ed4a8cc05948c8239b321057..10857a8da804f2d2dfa05fa6bba085b58d616d59 100644 (file)
--- a/mille/mille.c
+++ b/mille/mille.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: mille.c,v 1.8 1999/09/08 21:45:28 jsm Exp $    */
+/*     $NetBSD: mille.c,v 1.20 2011/08/31 16:24:56 plunky Exp $        */
 
 /*
  * Copyright (c) 1982, 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,38 +31,37 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1982, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mille.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: mille.c,v 1.8 1999/09/08 21:45:28 jsm Exp $");
+__RCSID("$NetBSD: mille.c,v 1.20 2011/08/31 16:24:56 plunky Exp $");
 #endif
 #endif /* not lint */
 
-# include      "mille.h"
-# include      <signal.h>
+#include <time.h>
+#include "mille.h"
+#include <signal.h>
 
 /*
  * @(#)mille.c 1.3 (Berkeley) 5/10/83
  */
 
 int
-main(ac, av)
-       int     ac;
-       char    *av[];
+main(int ac, char *av[])
 {
        bool    restore;
 
-       /* run as the user */
-       setuid(getuid());
+       /* Revoke setgid privileges */
+       setgid(getgid());
 
        if (strcmp(av[0], "a.out") == 0) {
                outf = fopen("q", "w");
-               setbuf(outf, (char *)NULL);
+               setbuf(outf, NULL);
                Debug = TRUE;
        }
        restore = FALSE;
@@ -78,11 +73,12 @@ main(ac, av)
                break;
          default:
                printf("usage: milles [ restore_file ]\n");
-               exit(-1);
+               exit(1);
                /* NOTREACHED */
        }
        Play = PLAYER;
-       initscr();
+       if (!initscr())
+               errx(0, "couldn't initialize screen");
        delwin(stdscr);
        stdscr = Board = newwin(BOARD_Y, BOARD_X, 0, 0);
        Score = newwin(SCORE_Y, SCORE_X, 0, 40);
@@ -95,12 +91,12 @@ main(ac, av)
        leaveok(Score, TRUE);
        leaveok(Miles, TRUE);
        clearok(curscr, TRUE);
-# ifndef PROF
-       srandom(getpid());
-# else
+#ifndef PROF
+       srandom((long) time(NULL));
+#else
        srandom(0);
-# endif
-       crmode();
+#endif
+       cbreak();
        noecho();
        signal(SIGINT, rub);
        for (;;) {
@@ -142,8 +138,7 @@ main(ac, av)
  * quit.
  */
 void
-rub(dummy)
-       int dummy __attribute__((__unused__));
+rub(int dummy __unused)
 {
        (void)signal(SIGINT, SIG_IGN);
        if (getyn(REALLYPROMPT))
@@ -155,8 +150,7 @@ rub(dummy)
  *     Time to go beddy-by
  */
 void
-die(code)
-       int code;
+die(int code)
 {
 
        (void)signal(SIGINT, SIG_IGN);