Use standard AUTHORS section header. From YOMURA Masanori in private mail

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

diff --git a/sail/main.c b/sail/main.c
index 1808be6ccdc0b549348ee58e069979e089df5699..5f030bdc09c563e37e2953a65962c604205b7044 100644 (file)
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.7 2000/02/09 22:27:56 jsm Exp $     */
+/*     $NetBSD: main.c,v 1.21 2003/08/07 09:37:43 agc 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.
  *
@@ -43,26 +39,25 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.7 2000/02/09 22:27:56 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.21 2003/08/07 09:37:43 agc Exp $");
 #endif
 #endif /* not lint */
 
-#include "extern.h"
 #include <fcntl.h>
-#include <unistd.h>
+#include <setjmp.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include "extern.h"
+#include "restart.h"
 
-int main __P((int, char **));
-
-/*ARGSUSED*/
 int
-main(argc, argv)
-       int argc;
-       char **argv;
+main(int argc, char **argv)
 {
        char *p;
-       int i;
+       int a,i;
        int fd;
 
        gid = getgid();
@@ -74,28 +69,28 @@ main(argc, argv)
                exit(1);
        close(fd);
 
-       (void) srand(getpid());
+       srandom((u_long)time(NULL));
+
        if ((p = strrchr(*argv, '/')) != NULL)
                p++;
        else
                p = *argv;
+
        if (strcmp(p, "driver") == 0 || strcmp(p, "saildriver") == 0)
                mode = MODE_DRIVER;
        else if (strcmp(p, "sail.log") == 0)
                mode = MODE_LOGGER;
        else
                mode = MODE_PLAYER;
-       while ((p = *++argv) && *p == '-')
-               switch (p[1]) {
+
+       while ((a = getopt(argc, argv, "dsxlb")) != -1)
+               switch (a) {
                case 'd':
                        mode = MODE_DRIVER;
                        break;
                case 's':
                        mode = MODE_LOGGER;
                        break;
-               case 'D':
-                       debug++;
-                       break;
                case 'x':
                        randomize++;
                        break;
@@ -109,12 +104,18 @@ main(argc, argv)
                        fprintf(stderr, "SAIL: Unknown flag %s.\n", p);
                        exit(1);
                }
+
+       argc -= optind;
+       argv += optind;
+
        if (*argv)
                game = atoi(*argv);
        else
                game = -1;
+
        if ((i = setjmp(restart)) != 0)
                mode = i;
+
        switch (mode) {
        case MODE_PLAYER:
                return pl_main();