improve rogue game save and restore

Clarified in `vers.c`, the purpose of the `release[]` string and
the `version[]` strings.

Write the `release[]` string, not the `version[]` string to the rogue save file.

Changed some recently added `stderr` directed warning and error messages
to `stdout` in order to match the rest of the warning and error messages.
Added `fflush(stdout)` to force a flush of such warning and error messages.

Detected when the rogue save file does not have a line that can be parsed.

Zeroized data before restoring rogue save file into that data.

Author: lcn2

extern.c

@@ -45,23 +45,24 @@ int  tombstone = TRUE;			/* Print out tombstone at end */
 #ifdef MASTER
 int  wizard = FALSE;			/* True if allows wizard commands */
 #endif
-int  pack_used[26] = {			/* Is the character used in the pack? */
+int  pack_used[MAXPACK + 1] = {		/* Is the character used in the pack? +1 for paranoia */
     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE
+    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+    FALSE, /* paranoia */
 };
 
 int  dir_ch;				/* Direction from last get_dir() call */
-char home[MAXSTR+1] = {'\0'};		/* User's home directory plus a trailing /, +1 for paranoia */
-char file_name[2*MAXSTR+1] = {'\0'};	/* home plus / plus rogue save file path, +1 for paranoia */
-char lock_path[2*MAXSTR+1] = {'\0'};	/* home plus / plus rogue lock file path, +1 for paranoia */
-char score_path[2*MAXSTR+1] = {'\0'};	/* home plus / plus rogue score file path, +1 for paranoia */
-char huh[MAXSTR+1];			/* The last message printed */
-const char *p_colors[MAXPOTIONS];		/* Colors of the potions */
-char prbuf[PFBUF_LEN+1] = {'\0'};	/* buffer for snprintfs, +1 for paranoia */
-const char *r_stones[MAXRINGS];		/* Stone settings of the rings */
+char home[MAXSTR + 1] = {'\0'};		/* User's home directory plus a trailing /, +1 for paranoia */
+char file_name[(2*MAXSTR) + 1] = {'\0'};	/* home plus / plus rogue save file path, +1 for paranoia */
+char lock_path[(2*MAXSTR) + 1] = {'\0'};	/* home plus / plus rogue lock file path, +1 for paranoia */
+char score_path[(2*MAXSTR) + 1] = {'\0'};	/* home plus / plus rogue score file path, +1 for paranoia */
+char huh[MAXSTR+1];			/* The last message printed, +1 for paranoia */
+const char *p_colors[MAXPOTIONS + 1];	/* Colors of the potions, +1 for paranoia */
+char prbuf[PFBUF_LEN + 1] = {'\0'};	/* buffer for snprintfs, +1 for paranoia */
+const char *r_stones[MAXRINGS + 1];	/* Stone settings of the rings, +1 for paranoia */
 int  runch;				/* Direction player is running */
-char *s_names[MAXSCROLLS];		/* Names of the scrolls */
+char *s_names[MAXSCROLLS + 1];		/* Names of the scrolls, +1 for paranoia */
 int  take;				/* Thing she is taking */
 const char *ws_made[MAXSTICKS];		/* What sticks are made of */
 char *ws_type[MAXSTICKS];		/* Is it a wand or a staff */
@@ -150,7 +151,7 @@ coord delta;				/* Change indicated to get_dir() */
 coord oldpos;				/* Position before last look() call */
 coord stairs;				/* Location of staircase */
 
-PLACE places[MAXLINES*MAXCOLS];		/* level map */
+PLACE places[(MAXLINES*MAXCOLS) + 1];		/* level map, +1 for paranoia */
 
 THING *cur_armor;			/* What he is wearing */
 THING *cur_ring[2];			/* Which rings are being worn */
@@ -169,8 +170,8 @@ WINDOW *hw = NULL;			/* used as a scratch window */
 struct stats max_stats = INIT_STATS;	/* The maximum for the player */
 
 struct room *oldrp;			/* Roomin(&oldpos) */
-struct room rooms[MAXROOMS];		/* One for each room -- A level */
-struct room passages[MAXPASS] =		/* One for each passage */
+struct room rooms[MAXROOMS + 1];	/* One for each room -- A level, +1 for paranoia */
+struct room passages[MAXPASS + 1] =	/* One for each passage, +1 for paranoia */
 {
     { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
     { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
@@ -184,12 +185,13 @@ struct room passages[MAXPASS] =		/* One for each passage */
     { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
     { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
     { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
-    { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }
+    { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} },
+    { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} } /* paranoia */
 };
 
 #define ___ 1
 #define XX 10
-struct monster monsters[26] =
+struct monster monsters[26 + 1] =
     {
 /* Name		 CARRY	FLAG    str, exp, lvl, amr, hpt, dmg */
 { "aquator",	   0,	ISMEAN,	{ XX, 20,   5,   2, ___, "0x0/0x0" } },
@@ -219,22 +221,24 @@ struct monster monsters[26] =
 { "wraith",	   0,	0,	{ XX, 55,   5,   4, ___, "1x6" } },
 { "xeroc",	  30,	0,	{ XX,100,   7,   7, ___, "4x4" } },
 { "yeti",	  30,	0,	{ XX, 50,   4,   6, ___, "1x6/1x6" } },
-{ "zombie",	   0,	ISMEAN,	{ XX,  6,   2,   8, ___, "1x8" } }
+{ "zombie",	   0,	ISMEAN,	{ XX,  6,   2,   8, ___, "1x8" } },
+{ "",		   0,	0,	{ 0,   0,   0,   0,   0, "" } }, /* paranoia */
     };
 #undef ___
 #undef XX
 
-struct obj_info things[NUMTHINGS] = {
+struct obj_info things[NUMTHINGS + 1] = {
     { 0,			26 },	/* potion */
     { 0,			36 },	/* scroll */
     { 0,			16 },	/* food */
     { 0,			 7 },	/* weapon */
     { 0,			 7 },	/* armor */
     { 0,			 4 },	/* ring */
     { 0,			 4 },	/* stick */
+    { 0,			 0 },	/* paranoia */
 };
 
-struct obj_info arm_info[MAXARMORS] = {
+struct obj_info arm_info[MAXARMORS + 1] = {
     { "leather armor",		 20,	 20, NULL, FALSE },
     { "ring mail",		 15,	 25, NULL, FALSE },
     { "studded leather armor",	 15,	 20, NULL, FALSE },
@@ -243,8 +247,9 @@ struct obj_info arm_info[MAXARMORS] = {
     { "splint mail",		 10,	 80, NULL, FALSE },
     { "banded mail",		 10,	 90, NULL, FALSE },
     { "plate mail",		  5,	150, NULL, FALSE },
+    { NULL,			  0,	  0, NULL, FALSE }, /* paranoia */
 };
-struct obj_info pot_info[MAXPOTIONS] = {
+struct obj_info pot_info[MAXPOTIONS + 1] = {
     { "confusion",		 7,   5, NULL, FALSE },
     { "hallucination",		 8,   5, NULL, FALSE },
     { "poison",			 8,   5, NULL, FALSE },
@@ -259,8 +264,9 @@ struct obj_info pot_info[MAXPOTIONS] = {
     { "restore strength",	13, 130, NULL, FALSE },
     { "blindness",		 5,   5, NULL, FALSE },
     { "levitation",		 6,  75, NULL, FALSE },
+    { NULL,			 0,   0, NULL, FALSE }, /* paranoia */
 };
-struct obj_info ring_info[MAXRINGS] = {
+struct obj_info ring_info[MAXRINGS + 1] = {
     { "protection",		 9, 400, NULL, FALSE },
     { "add strength",		 9, 400, NULL, FALSE },
     { "sustain strength",	 5, 280, NULL, FALSE },
@@ -275,8 +281,9 @@ struct obj_info ring_info[MAXRINGS] = {
     { "teleportation",		 5,  30, NULL, FALSE },
     { "stealth",		 7, 470, NULL, FALSE },
     { "maintain armor",		 5, 380, NULL, FALSE },
+    { NULL,			 0,   0, NULL, FALSE }, /* paranoia */
 };
-struct obj_info scr_info[MAXSCROLLS] = {
+struct obj_info scr_info[MAXSCROLLS + 1] = {
     { "monster confusion",		 7, 140, NULL, FALSE },
     { "magic mapping",			 4, 150, NULL, FALSE },
     { "hold monster",			 2, 180, NULL, FALSE },
@@ -295,8 +302,9 @@ struct obj_info scr_info[MAXSCROLLS] = {
     { "remove curse",			 7, 105, NULL, FALSE },
     { "aggravate monsters",		 3,  20, NULL, FALSE },
     { "protect armor",			 2, 250, NULL, FALSE },
+    { NULL,				 0,   0, NULL, FALSE }, /* paranoia */
 };
-struct obj_info weap_info[MAXWEAPONS + 1] = {
+struct obj_info weap_info[MAXWEAPONS + 1 + 1] = {
     { "mace",				11,   8, NULL, FALSE },
     { "long sword",			11,  15, NULL, FALSE },
     { "short bow",			12,  15, NULL, FALSE },
@@ -307,8 +315,9 @@ struct obj_info weap_info[MAXWEAPONS + 1] = {
     { "shuriken",			12,   5, NULL, FALSE },
     { "spear",				12,   5, NULL, FALSE },
     { NULL, 0 },	/* DO NOT REMOVE: fake entry for dragon's breath */
+    { NULL,				 0,   0, NULL, FALSE }, /* paranoia */
 };
-struct obj_info ws_info[MAXSTICKS] = {
+struct obj_info ws_info[MAXSTICKS + 1] = {
     { "light",			12, 250, NULL, FALSE },
     { "invisibility",		 6,   5, NULL, FALSE },
     { "lightning",		 3, 330, NULL, FALSE },
@@ -323,6 +332,7 @@ struct obj_info ws_info[MAXSTICKS] = {
     { "teleport away",		 6, 340, NULL, FALSE },
     { "teleport to",		 6,  50, NULL, FALSE },
     { "cancellation",		 5, 280, NULL, FALSE },
+    { NULL,			 0,   0, NULL, FALSE }, /* paranoia */
 };
 
 const struct h_list helpstr[] = {

extern.h

@@ -131,7 +131,8 @@ typedef unsigned int pid_t;
 #define PFBUF_LEN (2*MAXSTR)
 extern int got_ltc, in_shell;
 extern int	wizard;
-extern char	fruit[MAXSTR+1], prbuf[PFBUF_LEN+1];
+extern char	fruit[MAXSTR+1]; /* +1 for paranoia */
+extern char	prbuf[PFBUF_LEN+1]; /* +1 for paranoia */
 extern int orig_dsusp;
 extern FILE	*scoreboard;
 extern int numscores;

findpw.c

@@ -18,7 +18,7 @@
 
 extern char *xcrypt(const char *, const char *);
 
-char whoami[MAX_USERNAME] = {'\0'};	/* Name of player */
+char whoami[MAX_USERNAME+1] = {'\0'};	/* Name of player, +1 for paranoia */
 
 int
 main(int argc, char *argv[])
@@ -30,5 +30,6 @@ main(int argc, char *argv[])
     (void) fgets(buf, MAX_PW_LEN+1, stdin);
     buf[strlen(buf) - 1] = '\0';
     printf("%s\n", xcrypt(buf, "mT"));
+    fflush(stdout);
     return 0;
 }

init.c

@@ -428,7 +428,7 @@ badcheck(const char *name, const struct obj_info *info, int bound)
 
     if (info[bound - 1].oi_prob == 100)
 	return;
-    printf("\nBad percentages for %s (bound = %d):\n", name, bound);
+    printf("Bad percentages for %s (bound = %d):\n", name, bound);
     for (end = &info[bound]; info < end; info++)
 	printf("%3d%% %s\n", info->oi_prob, info->oi_name);
     printf("[hit RETURN to continue]");

mach_dep.c

@@ -74,10 +74,13 @@ init_check(void)
 	printf("Sorry, %s, but the system is too loaded now.\n", whoami);
 	printf("Try again later.  Meanwhile, why not enjoy a%s %s?\n",
 	    vowelstr(fruit), fruit);
-	if (author())
+	fflush(stdout);
+	if (author()) {
 	    printf("However, since you're a good guy, it's up to you\n");
-	else
+	    fflush(stdout);
+	} else {
 	    exit(1);
+	}
     }
 #endif
 }
@@ -149,8 +152,8 @@ open_score(void)
 	 */
 	scoreboard = fopen(score_path, "w+");
 	if (scoreboard == NULL) {
-	     fprintf(stderr, "Could not open %s for writing: %s\n", score_path, strerror(errno));
-	     fflush(stderr);
+	     printf("Could not open %s for writing: %s\n", score_path, strerror(errno));
+	     fflush(stdout);
 	     exit(1);
 	}
         md_chmod(score_path, 0664);
@@ -433,7 +436,8 @@ lock_sc(void)
 	lock_fd = open(lock_path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); /* more 0644 */
 	if (lock_fd < 0) {
 	    /* failed to open and/or create the lock file */
-	    fprintf(stderr, "\nERROR: failed to open lock file: %s\n", lock_path);
+	    printf("ERROR: failed to open lock file: %s\n", lock_path);
+	    fflush(stdout);
 	    return FALSE;
 	}
     }
@@ -444,7 +448,8 @@ lock_sc(void)
     ret = flock(lock_fd, LOCK_EX);
     if (ret < 0) {
 	/* failed to lock */
-	fprintf(stderr, "\nERROR: failed to lock: %s\n", lock_path);
+	printf("ERROR: failed to lock: %s\n", lock_path);
+	fflush(stdout);
 	return FALSE;
     }
 
@@ -486,7 +491,8 @@ unlock_sc(void)
     ret = flock(lock_fd, LOCK_UN);
     if (ret < 0) {
 	/* failed to lock */
-	fprintf(stderr, "\nERROR: failed to unlock: %s\n", lock_path);
+	printf("ERROR: failed to unlock: %s\n", lock_path);
+	fflush(stdout);
 	return;
     }
 

main.c

@@ -17,7 +17,7 @@
 #include "rogue.h"
 #include "score.h"
 
-char whoami[MAX_USERNAME] = {'\0'};	/* Name of player */
+char whoami[MAX_USERNAME+1] = {'\0'};	/* Name of player, +1 for paranoia */
 
 /*
  * main:
@@ -143,14 +143,18 @@ main(int argc, char **argv)
 	else if (strcmp(argv[1], "-V") == 0)
 	{
 	    printf("version %s (chongo was here) %s\n", release, version);
+	    fflush(stdout);
 	    exit(0);
 	}
     }
 
     init_check();			/* check for legal startup */
     if (argc == 2)
-	if (!restore(argv[1]))	/* Note: restore will never return */
-	    my_exit(1);
+	/* if restore works, it will never return */
+	if (!restore(argv[1])) {
+	    fflush(stdout);
+	    exit(1);
+	}
 #ifdef MASTER
     if (wizard)
 	printf("Hello %s, welcome to dungeon #%u", whoami, dnum);
@@ -183,7 +187,8 @@ main(int argc, char **argv)
       memset (pidfilename, '\0', sizeof(pidfilename));
       snprintf (pidfilename, BUFSIZ-1, "roguepid.%d", pid);
       if ((pidfp = fopen (pidfilename, "w")) == NULL) {
-        fprintf (stderr, "Can't open '%s'.\n", pidfilename);
+        printf("Can't open '%s'.\n", pidfilename);
+	fflush(stdout);
         exit(1);
       }
     }
@@ -202,8 +207,9 @@ main(int argc, char **argv)
      */
     if (LINES < NUMLINES || COLS < NUMCOLS)
     {
-	printf("\nSorry, the screen must be at least %dx%d\n", NUMLINES, NUMCOLS);
 	endwin();
+	printf("Sorry, the screen must be at least %dx%d\n", NUMLINES, NUMCOLS);
+	fflush(stdout);
 	my_exit(1);
     }
 

rip.c

@@ -129,7 +129,7 @@ score(int amount, int flags, int monst)
         refresh();
         wgetnstr(stdscr,prbuf,80);
 	endwin();
-        printf("\n");
+	putchar('\n');
         resetltchars();
 	/*
 	 * free up space to "guarantee" there is space for the top_scores
@@ -222,6 +222,7 @@ score(int amount, int flags, int monst)
 	putchar('\n');
     printf("Top %d %s:\n", NUMSCORES, allscore ? "Scores" : "Rogueists");
     printf("   Score Name\n");
+    fflush(stdout);
     for (scp = top_scores; scp < endp; scp++)
     {
 	if (scp->sc_score > 0) {
@@ -232,14 +233,15 @@ score(int amount, int flags, int monst)
 		reason[scp->sc_flags], scp->sc_level);
 	    if (scp->sc_flags == 0 || scp->sc_flags == 3)
 		printf(" by %s", killname(scp->sc_monster, TRUE));
+	    fflush(stdout);
 #ifdef MASTER
 	    if (prflags == 1)
 	    {
 		printf(" (%s)", md_getrealname(scp->sc_uid));
 	    }
 	    else if (prflags == 2)
 	    {
-		fflush(stdout);
+		memset(prbuf, 0, sizeof(prbuf));
 		(void) fgets(prbuf,10,stdin);
 		if (prbuf[0] == 'd')
 		{
@@ -253,13 +255,18 @@ score(int amount, int flags, int monst)
 	    else
 #endif /* MASTER */
                 printf(".");
+	    fflush(stdout);
 	    if (sc2 == scp)
 		    md_raw_standend();
             putchar('\n');
 	}
 	else
+	{
 	    break;
+	}
+	fflush(stdout);
     }
+
     /*
      * Update the list file
      */