BSD 4_3_Reno release

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

diff --git a/usr/src/games/sail/dr_main.c b/usr/src/games/sail/dr_main.c
index 305d854..03a5549 100644 (file)
--- a/usr/src/games/sail/dr_main.c
+++ b/usr/src/games/sail/dr_main.c
@@ -1,6 +1,25 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)dr_main.c   2.1 85/03/04";
-#endif
+static char sccsid[] = "@(#)dr_main.c  5.5 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 #include "driver.h"
 
 
 #include "driver.h"
 


@@ -9,6 +28,7 @@ dr_main()
        register int n;
        register struct ship *sp;
        int nat[NNATION];
        register int n;
        register struct ship *sp;
        int nat[NNATION];

+       int value = 0;

 
        (void) signal(SIGINT, SIG_IGN);
        (void) signal(SIGQUIT, SIG_IGN);
 
        (void) signal(SIGINT, SIG_IGN);
        (void) signal(SIGQUIT, SIG_IGN);


@@ -45,13 +65,15 @@ dr_main()
        }
        windspeed = cc->windspeed;
        winddir = cc->winddir;
        }
        windspeed = cc->windspeed;
        winddir = cc->winddir;

+       people = 0;

        for (;;) {
                sleep(7);
                if (Sync() < 0) {
        for (;;) {
                sleep(7);
                if (Sync() < 0) {

-                       sync_close(1);
-                       exit(1);
+                       value = 1;
+                       break;

                }
                }

-               next();
+               if (next() < 0)
+                       break;

                unfoul();
                checkup();
                prizecheck();
                unfoul();
                checkup();
                prizecheck();


@@ -63,8 +85,10 @@ dr_main()
                reload();
                checksails();
                if (Sync() < 0) {
                reload();
                checksails();
                if (Sync() < 0) {

-                       sync_close(1);
-                       exit(1);
+                       value = 1;
+                       break;

                }
        }
                }
        }

+       sync_close(1);
+       return value;

 }
 }