Don't cast the return value of calloc().

[bsdgames-darwin.git] / sail / pl_1.c

diff --git a/sail/pl_1.c b/sail/pl_1.c
index 0abd1ac3a7bcb1e85c0377c7c64e67981c1c44e1..5e2610568042019d3dc256c7a80197c5286c3d3c 100644 (file)
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $     */
+/*     $NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry 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,17 +29,23 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $";
+__RCSID("$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
-#include "player.h"
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "extern.h"
+#include "player.h"
 
 /*
  * If we get here before a ship is chosen, then ms == 0 and
@@ -53,38 +55,34 @@ static char rcsid[] = "$NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $";
  * Of course, we don't do any more Sync()'s if we got here
  * because of a Sync() failure.
  */
-leave(conditions)
-int conditions;
+void
+leave(int conditions)
 {
-       (void) signal(SIGHUP, SIG_IGN);
-       (void) signal(SIGINT, SIG_IGN);
-       (void) signal(SIGQUIT, SIG_IGN);
-       (void) signal(SIGALRM, SIG_IGN);
-       (void) signal(SIGCHLD, SIG_IGN);
+       signal(SIGHUP, SIG_IGN);
+       signal(SIGINT, SIG_IGN);
+       signal(SIGQUIT, SIG_IGN);
+       signal(SIGALRM, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);
 
        if (done_curses) {
-               Signal("It looks like you've had it!",
-                       (struct ship *)0);
+               Msg("It looks like you've had it!");
                switch (conditions) {
                case LEAVE_QUIT:
                        break;
                case LEAVE_CAPTURED:
-                       Signal("Your ship was captured.",
-                               (struct ship *)0);
+                       Msg("Your ship was captured.");
                        break;
                case LEAVE_HURRICAN:
-                       Signal("Hurricane!  All ships destroyed.",
-                               (struct ship *)0);
+                       Msg("Hurricane!  All ships destroyed.");
                        break;
                case LEAVE_DRIVER:
-                       Signal("The driver died.", (struct ship *)0);
+                       Msg("The driver died.");
                        break;
                case LEAVE_SYNC:
-                       Signal("Synchronization error.", (struct ship *)0);
+                       Msg("Synchronization error.");
                        break;
                default:
-                       Signal("A funny thing happened (%d).",
-                               (struct ship *)0, conditions);
+                       Msg("A funny thing happened (%d).", conditions);
                }
        } else {
                switch (conditions) {
@@ -106,36 +104,39 @@ int conditions;
        }
 
        if (ms != 0) {
-               log(ms);
+               logger(ms);
                if (conditions != LEAVE_SYNC) {
-                       makesignal(ms, "Captain %s relinquishing.",
-                               (struct ship *)0, mf->captain);
-                       Write(W_END, ms, 0, 0, 0, 0, 0);
-                       (void) Sync();
+                       makemsg(ms, "Captain %s relinquishing.",
+                               mf->captain);
+                       Write(W_END, ms, 0, 0, 0, 0);
+                       Sync();
                }
        }
        sync_close(!hasdriver);
+       sleep(5);
        cleanupscreen();
        exit(0);
 }
 
+/*ARGSUSED*/
 void
-choke()
+choke(int n __unused)
 {
        leave(LEAVE_QUIT);
 }
 
+/*ARGSUSED*/
 void
-child()
+child(int n __unused)
 {
-       union wait status;
+       int status;
        int pid;
 
-       (void) signal(SIGCHLD, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);
        do {
-               pid = wait3((int *)&status, WNOHANG, (struct rusage *)0);
-               if (pid < 0 || pid > 0 && !WIFSTOPPED(status))
+               pid = wait3(&status, WNOHANG, (struct rusage *)0);
+               if (pid < 0 || (pid > 0 && !WIFSTOPPED(status)))
                        hasdriver = 0;
        } while (pid > 0);
-       (void) signal(SIGCHLD, child);
+       signal(SIGCHLD, child);
 }