include sys/cdefs.h so that __attribute__ can be fixed later

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

diff --git a/sail/main.c b/sail/main.c
index ba4b3cfcd4d77061a85a73226c2c9064e46e9dde..5f030bdc09c563e37e2953a65962c604205b7044 100644 (file)
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.13 2000/11/30 22:07:24 jwise 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,17 +39,19 @@ __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.13 2000/11/30 22:07:24 jwise 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>
-
-int main (int, char **);
+#include <time.h>
+#include <unistd.h>
+#include "extern.h"
+#include "restart.h"
 
 int
 main(int argc, char **argv)
@@ -85,7 +83,7 @@ main(int argc, char **argv)
        else
                mode = MODE_PLAYER;
 
-       while ((a = getopt(argc, argv, "dsDxlb")))
+       while ((a = getopt(argc, argv, "dsxlb")) != -1)
                switch (a) {
                case 'd':
                        mode = MODE_DRIVER;
@@ -93,9 +91,6 @@ main(int argc, char **argv)
                case 's':
                        mode = MODE_LOGGER;
                        break;
-               case 'D':
-                       debug++;
-                       break;
                case 'x':
                        randomize++;
                        break;
@@ -110,6 +105,9 @@ main(int argc, char **argv)
                        exit(1);
                }
 
+       argc -= optind;
+       argv += optind;
+
        if (*argv)
                game = atoi(*argv);
        else