Sprinkle some "bool". And don't use '\0' to mean 'false'.

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

diff --git a/sail/pl_1.c b/sail/pl_1.c
index 9c0e01003ab2bb2467979a169ca4f65f38fdce57..5e2610568042019d3dc256c7a80197c5286c3d3c 100644 (file)
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_1.c,v 1.4 1997/10/13 19:44:53 christos Exp $        */
+/*     $NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $  */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -38,13 +34,18 @@
 #if 0
 static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: pl_1.c,v 1.4 1997/10/13 19:44:53 christos Exp $");
+__RCSID("$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

-#include "player.h"

 #include <sys/types.h>
 #include <sys/wait.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
 
 /*
  * If we get here before a ship is chosen, then ms == 0 and


@@ -55,14 +56,13 @@ __RCSID("$NetBSD: pl_1.c,v 1.4 1997/10/13 19:44:53 christos Exp $");
  * because of a Sync() failure.
  */
 void
  * because of a Sync() failure.
  */
 void

-leave(conditions)
-int conditions;
+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) {
                Msg("It looks like you've had it!");
 
        if (done_curses) {
                Msg("It looks like you've had it!");


@@ -106,38 +106,37 @@ int conditions;
        if (ms != 0) {
                logger(ms);
                if (conditions != LEAVE_SYNC) {
        if (ms != 0) {
                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);
                }
        }
        sync_close(!hasdriver);

+       sleep(5);

        cleanupscreen();
        exit(0);
 }
 
 /*ARGSUSED*/
 void
        cleanupscreen();
        exit(0);
 }
 
 /*ARGSUSED*/
 void

-choke(n)
-       int n;
+choke(int n __unused)

 {
        leave(LEAVE_QUIT);
 }
 
 /*ARGSUSED*/
 void
 {
        leave(LEAVE_QUIT);
 }
 
 /*ARGSUSED*/
 void

-child(n)
-       int n;
+child(int n __unused)

 {
 {

-       union wait status;
+       int status;

        int pid;
 
        int pid;
 

-       (void) signal(SIGCHLD, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);

        do {
        do {

-               pid = wait3((int *)&status, WNOHANG, (struct rusage *)0);
+               pid = wait3(&status, WNOHANG, (struct rusage *)0);

                if (pid < 0 || (pid > 0 && !WIFSTOPPED(status)))
                        hasdriver = 0;
        } while (pid > 0);
                if (pid < 0 || (pid > 0 && !WIFSTOPPED(status)))
                        hasdriver = 0;
        } while (pid > 0);

-       (void) signal(SIGCHLD, child);
+       signal(SIGCHLD, child);

 }
 }