Integrate Warp Kit into the NetBSD build

[bsdgames-darwin.git] / battlestar / init.c

diff --git a/battlestar/init.c b/battlestar/init.c
index b05d545cfbf7f7ae2d08a884687fc55cad22c4f8..1dd0e04ec66d4c151163a67500ca9969fa366d38 100644 (file)
--- a/battlestar/init.c
+++ b/battlestar/init.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: init.c,v 1.5 1997/01/07 11:56:45 tls Exp $     */
+/*     $NetBSD: init.c,v 1.16 2014/03/22 23:33:33 dholland 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.
  *
@@ -33,34 +29,37 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)init.c     8.4 (Berkeley) 4/30/95";
 #else
-static char rcsid[] = "$NetBSD: init.c,v 1.5 1997/01/07 11:56:45 tls Exp $";
+__RCSID("$NetBSD: init.c,v 1.16 2014/03/22 23:33:33 dholland Exp $");
 #endif
-#endif /* not lint */
+#endif                         /* not lint */
 
-#include <sys/types.h>
 #include "extern.h"
-#include <pwd.h>
 
-initialize(startup)
-       char startup;
+static int checkout(const char *);
+static const char *getutmp(void);
+static int wizard(const char *);
+
+void
+initialize(const char *filename)
 {
-       register struct objs *p;
-       void die();
+       const struct objs *p;
+       char *savefile;
 
        puts("Version 4.2, fall 1984.");
        puts("First Adventure game written by His Lordship, the honorable");
        puts("Admiral D.W. Riggle\n");
        location = dayfile;
-       srand(getpid());
-       getutmp(uname);
+       srandom(time(NULL));
+       username = getutmp();
        wordinit();
-       if (startup) {
+       if (filename == NULL) {
                direction = NORTH;
-               time = 0;
+               ourtime = 0;
                snooze = CYCLE * 1.5;
                position = 22;
                setbit(wear, PAJAMAS);
@@ -68,22 +67,29 @@ initialize(startup)
                torps = TORPEDOES;
                for (p = dayobjs; p->room != 0; p++)
                        setbit(location[p->room].objects, p->obj);
-       } else
-               restore();
-       wiz = wizard(uname);
-       signal(SIGINT, die);
+       } else {
+               savefile = save_file_name(filename, strlen(filename));
+               restore(savefile);
+               free(savefile);
+       }
+       wiz = wizard(username);
+       signal(SIGINT, diesig);
 }
 
-getutmp(uname)
-       char *uname;
+static const char *
+getutmp(void)
 {
        struct passwd *ptr;
 
        ptr = getpwuid(getuid());
-       strcpy(uname, ptr ? ptr->pw_name : "");
+       if (ptr == NULL)
+               return "";
+       else
+               return strdup(ptr->pw_name);
 }
 
-char *list[] = {       /* hereditary wizards */
+/* Hereditary wizards.  A configuration file might make more sense. */
+static const char *const list[] = {
        "riggle",
        "chris",
        "edward",
@@ -94,27 +100,27 @@ char *list[] = {   /* hereditary wizards */
        0
 };
 
-char *badguys[] = {
+static const char *const badguys[] = {
        "wnj",
        "root",
        "ted",
        0
 };
 
-wizard(uname)
-       char *uname;
+static int
+wizard(const char *uname)
 {
-       char flag;
+       int     flag;
 
-       if (flag = checkout(uname))
+       if ((flag = checkout(uname)) != 0)
                printf("You are the Great wizard %s.\n", uname);
        return flag;
 }
 
-checkout(uname)
-       register char *uname;
+static int
+checkout(const char *uname)
 {
-       register char **ptr;
+       const char  *const *ptr;
 
        for (ptr = list; *ptr; ptr++)
                if (strcmp(*ptr, uname) == 0)
@@ -122,10 +128,10 @@ checkout(uname)
        for (ptr = badguys; *ptr; ptr++)
                if (strcmp(*ptr, uname) == 0) {
                        printf("You are the Poor anti-wizard %s.  Good Luck!\n",
-                               uname);
+                           uname);
                        CUMBER = 3;
                        WEIGHT = 9;     /* that'll get him! */
-                       clock = 10;
+                       ourclock = 10;
                        setbit(location[7].objects, WOODSMAN);  /* viper room */
                        setbit(location[20].objects, WOODSMAN); /* laser " */
                        setbit(location[13].objects, DARK);     /* amulet " */