Fix merge conflicts

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

diff --git a/sail/main.c b/sail/main.c
index 35b5e388caccaf2b5d23c9b619206e5e29fd3b7c..fdb9d8302896d22bea775f683d5f01f0c161dcc4 100644 (file)
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: main.c,v 1.26 2010/08/06 09:14:40 dholland Exp $       */
+

 /*
 /*

- * 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, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,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.
  *


@@ -31,77 +29,150 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
+ The Regents of the University of California.  All rights reserved.");

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

-static char sccsid[] = "@(#)main.c     5.5 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: main.c,v 1.26 2010/08/06 09:14:40 dholland Exp $");
+#endif

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

-#include "externs.h"
+#include <ctype.h>
+#include <err.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include "extern.h"
+#include "pathnames.h"
+#include "restart.h"

 
 

-/*ARGSUSED*/
-main(argc, argv)
-       int argc;
-       register char **argv;
+static void
+initialize(void)

 {
 {

-       register char *p;
-       int i;
+       int fd;
+       const char *name;
+       struct passwd *pw;
+       char *s;
+
+       gid = getgid();
+       egid = getegid();
+       setegid(gid);
+
+       fd = open("/dev/null", O_RDONLY);
+       if (fd < 3)
+               exit(1);
+       close(fd);
+
+       if (chdir(_PATH_SAILDIR) < 0) {
+               err(1, "%s", _PATH_SAILDIR);
+       }
+
+       srandom((u_long)time(NULL));
+
+       name = getenv("SAILNAME");
+       if (name != NULL && *name != '\0') {
+               strlcpy(myname, name, sizeof(myname));
+       } else {
+               pw = getpwuid(getuid());
+               if (pw != NULL) {
+                       strlcpy(myname, pw->pw_gecos, sizeof(myname));
+                       /* trim to just the realname */
+                       s = strchr(myname, ',');
+                       if (s != NULL) {
+                               *s = '\0';
+                       }
+                       /* use just the first name */
+                       s = strchr(myname, ' ');
+                       if (s != NULL) {
+                               *s = '\0';
+                       }
+                       /* should really do &-expansion properly */
+                       if (!strcmp(myname, "&")) {
+                               strlcpy(myname, pw->pw_name, sizeof(myname));
+                               myname[0] = toupper((unsigned char)myname[0]);
+                       }
+               }
+       }
+       if (*myname == '\0') {
+               strlcpy(myname, "Anonymous", sizeof(myname));
+       }
+}

 
 

-       (void) srand(getpid());
-       issetuid = getuid() != geteuid();
-       if (p = rindex(*argv, '/'))
+int
+main(int argc, char **argv)
+{
+       char *p;
+       int a, i;
+
+       initialize();
+
+       if ((p = strrchr(*argv, '/')) != NULL)

                p++;
        else
                p = *argv;
                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;
        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':
                        mode = MODE_DRIVER;
                        break;
                case 's':
                        mode = MODE_LOGGER;
                        break;

-               case 'D':
-                       debug++;
-                       break;

                case 'x':
                case 'x':

-                       randomize;
+                       randomize = true;

                        break;
                case 'l':
                        break;
                case 'l':

-                       longfmt++;
+                       longfmt = true;

                        break;
                case 'b':
                        break;
                case 'b':

-                       nobells++;
+                       nobells = true;

                        break;
                default:
                        break;
                default:

-                       fprintf(stderr, "SAIL: Unknown flag %s.\n", p);
-                       exit(1);
+                       errx(1, "Usage: %s [-bdlsx] [scenario-number]", p);

                }
                }

+
+       argc -= optind;
+       argv += optind;
+

        if (*argv)
                game = atoi(*argv);
        else
                game = -1;
        if (*argv)
                game = atoi(*argv);
        else
                game = -1;

-       if (i = setjmp(restart))
+
+       if ((i = setjmp(restart)) != 0)

                mode = i;
                mode = i;

+

        switch (mode) {
        case MODE_PLAYER:
        switch (mode) {
        case MODE_PLAYER:

-               return pl_main();
+               initscreen();
+               startup();
+               cleanupscreen();
+               return 0;

        case MODE_DRIVER:
                return dr_main();
        case MODE_LOGGER:
                return lo_main();
        default:
        case MODE_DRIVER:
                return dr_main();
        case MODE_LOGGER:
                return lo_main();
        default:

-               fprintf(stderr, "SAIL: Unknown mode %d.\n", mode);
+               warnx("Unknown mode %d", mode);

                abort();
        }
        /*NOTREACHED*/
                abort();
        }
        /*NOTREACHED*/