4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / usr / src / games / sail / pl_1.c

diff --git a/usr/src/games/sail/pl_1.c b/usr/src/games/sail/pl_1.c
index 393c981..a39ffa2 100644 (file)
--- a/usr/src/games/sail/pl_1.c
+++ b/usr/src/games/sail/pl_1.c
@@ -1,22 +1,12 @@
 /*
 /*

- * Copyright (c) 1983 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 are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pl_1.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "player.h"
 #endif /* not lint */
 
 #include "player.h"


@@ -97,11 +87,13 @@ int conditions;
        exit(0);
 }
 
        exit(0);
 }
 

+void

 choke()
 {
        leave(LEAVE_QUIT);
 }
 
 choke()
 {
        leave(LEAVE_QUIT);
 }
 

+void

 child()
 {
        union wait status;
 child()
 {
        union wait status;


@@ -109,7 +101,7 @@ child()
 
        (void) signal(SIGCHLD, SIG_IGN);
        do {
 
        (void) signal(SIGCHLD, SIG_IGN);
        do {

-               pid = wait3(&status, WNOHANG, (struct rusage *)0);
+               pid = wait3((int *)&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);