Use .Nm instead of "arithmetic" in one place. From jmc@openbsd.

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

diff --git a/monop/monop.c b/monop/monop.c
index f0cf83d17473a64335fb4d715e5e640dd9721f58..12d3b5fe41b44c122510e7f790f2c2509432521d 100644 (file)
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: monop.c,v 1.6 1999/08/21 10:40:03 simonb Exp $ */
+/*     $NetBSD: monop.c,v 1.13 2003/04/21 01:25:27 christos Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)monop.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: monop.c,v 1.6 1999/08/21 10:40:03 simonb Exp $");
+__RCSID("$NetBSD: monop.c,v 1.13 2003/04/21 01:25:27 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,6 +58,7 @@ static void getplayers __P((void));
 static void init_players __P((void));
 static void init_monops __P((void));
 static void do_quit __P((int));
+void *heapstart;
 
 /*
  *     This program implements a monopoly game
@@ -67,7 +68,11 @@ main(ac, av)
        int ac;
        char *av[];
 {
+       /* Revoke setgid privileges */
+       setgid(getgid());
+
        srand(getpid());
+       heapstart = sbrk(0);
        if (ac > 1) {
                if (!rest_f(av[1]))
                        restore();
@@ -92,7 +97,7 @@ main(ac, av)
 /*ARGSUSED*/
 static void
 do_quit(n)
-       int n;
+       int n __attribute__((__unused__));
 {
        quit();
 }
@@ -116,6 +121,8 @@ blew_it:
                        break;
        }
        cur_p = play = (PLAY *) calloc(num_play, sizeof (PLAY));
+       if (play == NULL)
+               err(1, NULL);
        for (i = 0; i < num_play; i++) {
 over:
                printf("Player %d's name: ", i + 1);
@@ -124,7 +131,10 @@ over:
                if (sp == buf)
                        goto over;
                *sp++ = '\0';
-               strcpy(name_list[i]=play[i].name=(char *)calloc(1,sp-buf),buf);
+               name_list[i] = play[i].name = (char *)calloc(1, sp - buf);
+               if (name_list[i] == NULL)
+                       err(1, NULL);
+               strcpy(play[i].name, buf);
                play[i].money = 1500;
        }
        name_list[i++] = "done";
@@ -179,7 +189,7 @@ again:
 }
 
 /*
- *     This routine initalizes the monopoly structures.
+ *     This routine initializes the monopoly structures.
  */
 static void
 init_monops()