WARNsify...

1 files changed, 481 insertions, 394 deletions

diff --git a/hack/hack.end.c b/hack/hack.end.c
index 20b77e4f..0d99ef58 100644
--- a/hack/hack.end.c
+++ b/hack/hack.end.c
@@ -1,202 +1,241 @@
+/*	$NetBSD: hack.end.c,v 1.4 1997/10/19 16:57:55 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.end.c,v 1.3 1995/03/23 08:30:05 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.end.c,v 1.4 1997/10/19 16:57:55 christos Exp $");
+#endif				/* not lint */
 
-#include "hack.h"
-#include <stdio.h>
 #include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "hack.h"
+#include "extern.h"
 #define	Sprintf	(void) sprintf
-extern char plname[], pl_character[];
-extern char *itoa(), *ordin(), *eos();
 
-xchar maxdlevel = 1;
+xchar           maxdlevel = 1;
 
+int
+dodone()
+{
+	done1(0);
+	return 0;
+}
+
+
+/*ARGSUSED*/
 void
-done1()
+done1(n)
+	int n;
 {
-	(void) signal(SIGINT,SIG_IGN);
+	(void) signal(SIGINT, SIG_IGN);
 	pline("Really quit?");
-	if(readchar() != 'y') {
-		(void) signal(SIGINT,done1);
+	if (readchar() != 'y') {
+		(void) signal(SIGINT, done1);
 		clrlin();
 		(void) fflush(stdout);
-		if(multi > 0) nomul(0);
+		if (multi > 0)
+			nomul(0);
 		return;
 	}
 	done("quit");
 	/* NOTREACHED */
 }
 
-int done_stopprint;
-int done_hup;
+int             done_stopprint;
+int             done_hup;
 
+/*ARGSUSED*/
 void
-done_intr(){
+done_intr(n)
+	int n;
+{
 	done_stopprint++;
 	(void) signal(SIGINT, SIG_IGN);
 	(void) signal(SIGQUIT, SIG_IGN);
 }
 
 void
-done_hangup(){
+done_hangup(n)
+	int n;
+{
 	done_hup++;
 	(void) signal(SIGHUP, SIG_IGN);
-	done_intr();
+	done_intr(n);
 }
 
-done_in_by(mtmp) register struct monst *mtmp; {
-static char buf[BUFSZ];
+void
+done_in_by(mtmp)
+	struct monst   *mtmp;
+{
+	static char     buf[BUFSZ];
 	pline("You die ...");
-	if(mtmp->data->mlet == ' '){
+	if (mtmp->data->mlet == ' ') {
 		Sprintf(buf, "the ghost of %s", (char *) mtmp->mextra);
 		killer = buf;
-	} else if(mtmp->mnamelth) {
+	} else if (mtmp->mnamelth) {
 		Sprintf(buf, "%s called %s",
 			mtmp->data->mname, NAME(mtmp));
 		killer = buf;
-	} else if(mtmp->minvis) {
+	} else if (mtmp->minvis) {
 		Sprintf(buf, "invisible %s", mtmp->data->mname);
 		killer = buf;
-	} else killer = mtmp->data->mname;
+	} else
+		killer = mtmp->data->mname;
 	done("died");
 }
 
-/* called with arg "died", "drowned", "escaped", "quit", "choked", "panicked",
-   "burned", "starved" or "tricked" */
+/*
+ * called with arg "died", "drowned", "escaped", "quit", "choked",
+ * "panicked", "burned", "starved" or "tricked"
+ */
 /* Be careful not to call panic from here! */
+void
 done(st1)
-register char *st1;
+	char           *st1;
 {
 
 #ifdef WIZARD
-	if(wizard && *st1 == 'd'){
+	if (wizard && *st1 == 'd') {
 		u.uswldtim = 0;
-		if(u.uhpmax < 0) u.uhpmax = 100;	/* arbitrary */
+		if (u.uhpmax < 0)
+			u.uhpmax = 100;	/* arbitrary */
 		u.uhp = u.uhpmax;
 		pline("For some reason you are still alive.");
 		flags.move = 0;
-		if(multi > 0) multi = 0; else multi = -1;
+		if (multi > 0)
+			multi = 0;
+		else
+			multi = -1;
 		flags.botl = 1;
 		return;
 	}
-#endif WIZARD
+#endif	/* WIZARD */
 	(void) signal(SIGINT, done_intr);
 	(void) signal(SIGQUIT, done_intr);
 	(void) signal(SIGHUP, done_hangup);
-	if(*st1 == 'q' && u.uhp < 1){
+	if (*st1 == 'q' && u.uhp < 1) {
 		st1 = "died";
 		killer = "quit while already on Charon's boat";
 	}
-	if(*st1 == 's') killer = "starvation"; else
-	if(*st1 == 'd' && st1[1] == 'r') killer = "drowning"; else
-	if(*st1 == 'p') killer = "panic"; else
-	if(*st1 == 't') killer = "trickery"; else
-	if(!index("bcd", *st1)) killer = st1;
+	if (*st1 == 's')
+		killer = "starvation";
+	else if (*st1 == 'd' && st1[1] == 'r')
+		killer = "drowning";
+	else if (*st1 == 'p')
+		killer = "panic";
+	else if (*st1 == 't')
+		killer = "trickery";
+	else if (!strchr("bcd", *st1))
+		killer = st1;
 	paybill();
 	clearlocks();
-	if(flags.toplin == 1) more();
-	if(index("bcds", *st1)){
+	if (flags.toplin == 1)
+		more();
+	if (strchr("bcds", *st1)) {
 #ifdef WIZARD
-	    if(!wizard)
-#endif WIZARD
-		savebones();
-		if(!flags.notombstone)
+		if (!wizard)
+#endif	/* WIZARD */
+			savebones();
+		if (!flags.notombstone)
 			outrip();
 	}
-	if(*st1 == 'c') killer = st1;		/* after outrip() */
+	if (*st1 == 'c')
+		killer = st1;	/* after outrip() */
 	settty((char *) 0);	/* does a clear_screen() */
-	if(!done_stopprint)
+	if (!done_stopprint)
 		printf("Goodbye %s %s...\n\n", pl_character, plname);
-	{ long int tmp;
-	  tmp = u.ugold - u.ugold0;
-	  if(tmp < 0)
-		tmp = 0;
-	  if(*st1 == 'd' || *st1 == 'b')
-		tmp -= tmp/10;
-	  u.urexp += tmp;
-	  u.urexp += 50 * maxdlevel;
-	  if(maxdlevel > 20)
-		u.urexp += 1000*((maxdlevel > 30) ? 10 : maxdlevel - 20);
+	{
+		long int        tmp;
+		tmp = u.ugold - u.ugold0;
+		if (tmp < 0)
+			tmp = 0;
+		if (*st1 == 'd' || *st1 == 'b')
+			tmp -= tmp / 10;
+		u.urexp += tmp;
+		u.urexp += 50 * maxdlevel;
+		if (maxdlevel > 20)
+			u.urexp += 1000 * ((maxdlevel > 30) ? 10 : maxdlevel - 20);
 	}
-	if(*st1 == 'e') {
-		extern struct monst *mydogs;
-		register struct monst *mtmp;
-		register struct obj *otmp;
-		register int i;
-		register unsigned worthlessct = 0;
-		boolean has_amulet = FALSE;
+	if (*st1 == 'e') {
+		struct monst   *mtmp;
+		struct obj     *otmp;
+		int             i;
+		unsigned        worthlessct = 0;
+		boolean         has_amulet = FALSE;
 
 		killer = st1;
 		keepdogs();
 		mtmp = mydogs;
-		if(mtmp) {
-			if(!done_stopprint) printf("You");
-			while(mtmp) {
-				if(!done_stopprint)
+		if (mtmp) {
+			if (!done_stopprint)
+				printf("You");
+			while (mtmp) {
+				if (!done_stopprint)
 					printf(" and %s", monnam(mtmp));
-				if(mtmp->mtame)
+				if (mtmp->mtame)
 					u.urexp += mtmp->mhp;
 				mtmp = mtmp->nmon;
 			}
-			if(!done_stopprint)
-		    printf("\nescaped from the dungeon with %ld points,\n",
-			u.urexp);
-		} else
-		if(!done_stopprint)
-		  printf("You escaped from the dungeon with %ld points,\n",
-		    u.urexp);
-		for(otmp = invent; otmp; otmp = otmp->nobj) {
-			if(otmp->olet == GEM_SYM){
+			if (!done_stopprint)
+				printf("\nescaped from the dungeon with %ld points,\n",
+				       u.urexp);
+		} else if (!done_stopprint)
+			printf("You escaped from the dungeon with %ld points,\n",
+			       u.urexp);
+		for (otmp = invent; otmp; otmp = otmp->nobj) {
+			if (otmp->olet == GEM_SYM) {
 				objects[otmp->otyp].oc_name_known = 1;
-				i = otmp->quan*objects[otmp->otyp].g_val;
-				if(i == 0) {
+				i = otmp->quan * objects[otmp->otyp].g_val;
+				if (i == 0) {
 					worthlessct += otmp->quan;
 					continue;
 				}
 				u.urexp += i;
-				if(!done_stopprint)
-				  printf("\t%s (worth %d Zorkmids),\n",
-				    doname(otmp), i);
-			} else if(otmp->olet == AMULET_SYM) {
+				if (!done_stopprint)
+					printf("\t%s (worth %d Zorkmids),\n",
+					       doname(otmp), i);
+			} else if (otmp->olet == AMULET_SYM) {
 				otmp->known = 1;
 				i = (otmp->spe < 0) ? 2 : 5000;
 				u.urexp += i;
-				if(!done_stopprint)
-				  printf("\t%s (worth %d Zorkmids),\n",
-				    doname(otmp), i);
-				if(otmp->spe >= 0) {
+				if (!done_stopprint)
+					printf("\t%s (worth %d Zorkmids),\n",
+					       doname(otmp), i);
+				if (otmp->spe >= 0) {
 					has_amulet = TRUE;
 					killer = "escaped (with amulet)";
 				}
 			}
 		}
-		if(worthlessct) if(!done_stopprint)
-		  printf("\t%u worthless piece%s of coloured glass,\n",
-		  worthlessct, plur(worthlessct));
-		if(has_amulet) u.urexp *= 2;
-	} else
-		if(!done_stopprint)
-		  printf("You %s on dungeon level %d with %ld points,\n",
-		    st1, dlevel, u.urexp);
-	if(!done_stopprint)
-	  printf("and %ld piece%s of gold, after %ld move%s.\n",
-	    u.ugold, plur(u.ugold), moves, plur(moves));
-	if(!done_stopprint)
-  printf("You were level %u with a maximum of %d hit points when you %s.\n",
-	    u.ulevel, u.uhpmax, st1);
-	if(*st1 == 'e' && !done_stopprint){
+		if (worthlessct)
+			if (!done_stopprint)
+				printf("\t%u worthless piece%s of coloured glass,\n",
+				       worthlessct, plur(worthlessct));
+		if (has_amulet)
+			u.urexp *= 2;
+	} else if (!done_stopprint)
+		printf("You %s on dungeon level %d with %ld points,\n",
+		       st1, dlevel, u.urexp);
+	if (!done_stopprint)
+		printf("and %ld piece%s of gold, after %ld move%s.\n",
+		       u.ugold, plur(u.ugold), moves, plur(moves));
+	if (!done_stopprint)
+		printf("You were level %u with a maximum of %d hit points when you %s.\n",
+		       u.ulevel, u.uhpmax, st1);
+	if (*st1 == 'e' && !done_stopprint) {
 		getret();	/* all those pieces of coloured glass ... */
 		cls();
 	}
 #ifdef WIZARD
-	if(!wizard)
-#endif WIZARD
+	if (!wizard)
+#endif	/* WIZARD */
 		topten();
-	if(done_stopprint) printf("\n\n");
+	if (done_stopprint)
+		printf("\n\n");
 	exit(0);
 }
 
@@ -209,45 +248,46 @@ register char *st1;
 #define	PERS_IS_UID		/* delete for PERSMAX per name; now per uid */
 struct toptenentry {
 	struct toptenentry *tt_next;
-	long int points;
-	int level,maxlvl,hp,maxhp;
-	int uid;
-	char plchar;
-	char sex;
-	char name[NAMSZ+1];
-	char death[DTHSZ+1];
-	char date[7];		/* yymmdd */
-} *tt_head;
+	long int        points;
+	int             level, maxlvl, hp, maxhp;
+	int             uid;
+	char            plchar;
+	char            sex;
+	char            name[NAMSZ + 1];
+	char            death[DTHSZ + 1];
+	char            date[7];/* yymmdd */
+}              *tt_head;
 
-topten(){
-	int uid = getuid();
-	int rank, rank0 = -1, rank1 = 0;
-	int occ_cnt = PERSMAX;
-	register struct toptenentry *t0, *t1, *tprev;
-	char *recfile = RECORD;
-	char *reclock = "record_lock";
-	int sleepct = 300;
-	FILE *rfile;
-	register flg = 0;
-	extern char *getdate();
+void
+topten()
+{
+	int             uid = getuid();
+	int             rank, rank0 = -1, rank1 = 0;
+	int             occ_cnt = PERSMAX;
+	struct toptenentry *t0, *t1, *tprev;
+	char           *recfile = RECORD;
+	char           *reclock = "record_lock";
+	int             sleepct = 300;
+	FILE           *rfile;
+	int 		flg = 0;
 #define	HUP	if(!done_hup)
-	while(link(recfile, reclock) == -1) {
-		HUP perror(reclock);
-		if(!sleepct--) {
-			HUP puts("I give up. Sorry.");
-			HUP puts("Perhaps there is an old record_lock around?");
+	while (link(recfile, reclock) == -1) {
+		HUP             perror(reclock);
+		if (!sleepct--) {
+			HUP             puts("I give up. Sorry.");
+			HUP             puts("Perhaps there is an old record_lock around?");
 			return;
 		}
-		HUP printf("Waiting for access to record file. (%d)\n",
-			sleepct);
-		HUP (void) fflush(stdout);
+		HUP             printf("Waiting for access to record file. (%d)\n",
+				                       sleepct);
+		HUP(void) fflush(stdout);
 		sleep(1);
 	}
-	if(!(rfile = fopen(recfile,"r"))){
-		HUP puts("Cannot open record file!");
+	if (!(rfile = fopen(recfile, "r"))) {
+		HUP             puts("Cannot open record file!");
 		goto unlock;
 	}
-	HUP (void) putchar('\n');
+	HUP(void) putchar('\n');
 
 	/* create a new 'topten' entry */
 	t0 = newttentry();
@@ -266,238 +306,275 @@ topten(){
 	(void) strcpy(t0->date, getdate());
 
 	/* assure minimum number of points */
-	if(t0->points < POINTSMIN)
+	if (t0->points < POINTSMIN)
 		t0->points = 0;
 
 	t1 = tt_head = newttentry();
 	tprev = 0;
 	/* rank0: -1 undefined, 0 not_on_list, n n_th on list */
-	for(rank = 1; ; ) {
-	  if(fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]",
-		t1->date, &t1->uid,
-		&t1->level, &t1->maxlvl,
-		&t1->hp, &t1->maxhp, &t1->points,
-		&t1->plchar, &t1->sex, t1->name, t1->death) != 11
-	  || t1->points < POINTSMIN)
+	for (rank = 1;;) {
+		if (fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]",
+			   t1->date, &t1->uid,
+			   &t1->level, &t1->maxlvl,
+			   &t1->hp, &t1->maxhp, &t1->points,
+			   &t1->plchar, &t1->sex, t1->name, t1->death) != 11
+		    || t1->points < POINTSMIN)
 			t1->points = 0;
-	  if(rank0 < 0 && t1->points < t0->points) {
-		rank0 = rank++;
-		if(tprev == 0)
-			tt_head = t0;
-		else
-			tprev->tt_next = t0;
-		t0->tt_next = t1;
-		occ_cnt--;
-		flg++;		/* ask for a rewrite */
-	  } else
-		tprev = t1;
-	  if(t1->points == 0) break;
-	  if(
+		if (rank0 < 0 && t1->points < t0->points) {
+			rank0 = rank++;
+			if (tprev == 0)
+				tt_head = t0;
+			else
+				tprev->tt_next = t0;
+			t0->tt_next = t1;
+			occ_cnt--;
+			flg++;	/* ask for a rewrite */
+		} else
+			tprev = t1;
+		if (t1->points == 0)
+			break;
+		if (
 #ifdef PERS_IS_UID
-	     t1->uid == t0->uid &&
+		    t1->uid == t0->uid &&
 #else
-	     strncmp(t1->name, t0->name, NAMSZ) == 0 &&
-#endif PERS_IS_UID
-	     t1->plchar == t0->plchar && --occ_cnt <= 0){
-		if(rank0 < 0){
-			rank0 = 0;
-			rank1 = rank;
-	HUP printf("You didn't beat your previous score of %ld points.\n\n",
-				t1->points);
+		    strncmp(t1->name, t0->name, NAMSZ) == 0 &&
+#endif	/* PERS_IS_UID */
+		    t1->plchar == t0->plchar && --occ_cnt <= 0) {
+			if (rank0 < 0) {
+				rank0 = 0;
+				rank1 = rank;
+				HUP             printf("You didn't beat your previous score of %ld points.\n\n",
+						                t1->points);
+			}
+			if (occ_cnt < 0) {
+				flg++;
+				continue;
+			}
 		}
-		if(occ_cnt < 0){
-			flg++;
-			continue;
+		if (rank <= ENTRYMAX) {
+			t1 = t1->tt_next = newttentry();
+			rank++;
+		}
+		if (rank > ENTRYMAX) {
+			t1->points = 0;
+			break;
 		}
-	  }
-	  if(rank <= ENTRYMAX){
-	  	t1 = t1->tt_next = newttentry();
-	  	rank++;
-	  }
-	  if(rank > ENTRYMAX){
-		t1->points = 0;
-		break;
-	  }
 	}
-	if(flg) {	/* rewrite record file */
+	if (flg) {		/* rewrite record file */
 		(void) fclose(rfile);
-		if(!(rfile = fopen(recfile,"w"))){
-			HUP puts("Cannot write record file\n");
+		if (!(rfile = fopen(recfile, "w"))) {
+			HUP             puts("Cannot write record file\n");
 			goto unlock;
 		}
-
-		if(!done_stopprint) if(rank0 > 0){
-		    if(rank0 <= 10)
-			puts("You made the top ten list!\n");
-		    else
-		printf("You reached the %d%s place on the top %d list.\n\n",
-			rank0, ordin(rank0), ENTRYMAX);
-		}
+		if (!done_stopprint)
+			if (rank0 > 0) {
+				if (rank0 <= 10)
+					puts("You made the top ten list!\n");
+				else
+					printf("You reached the %d%s place on the top %d list.\n\n",
+					     rank0, ordin(rank0), ENTRYMAX);
+			}
 	}
-	if(rank0 == 0) rank0 = rank1;
-	if(rank0 <= 0) rank0 = rank;
-	if(!done_stopprint) outheader();
+	if (rank0 == 0)
+		rank0 = rank1;
+	if (rank0 <= 0)
+		rank0 = rank;
+	if (!done_stopprint)
+		outheader();
 	t1 = tt_head;
-	for(rank = 1; t1->points != 0; rank++, t1 = t1->tt_next) {
-	  if(flg) fprintf(rfile,"%6s %d %d %d %d %d %ld %c%c %s,%s\n",
-	    t1->date, t1->uid,
-	    t1->level, t1->maxlvl,
-	    t1->hp, t1->maxhp, t1->points,
-	    t1->plchar, t1->sex, t1->name, t1->death);
-	  if(done_stopprint) continue;
-	  if(rank > flags.end_top &&
-	    (rank < rank0-flags.end_around || rank > rank0+flags.end_around)
-	    && (!flags.end_own ||
+	for (rank = 1; t1->points != 0; rank++, t1 = t1->tt_next) {
+		if (flg)
+			fprintf(rfile, "%6s %d %d %d %d %d %ld %c%c %s,%s\n",
+				t1->date, t1->uid,
+				t1->level, t1->maxlvl,
+				t1->hp, t1->maxhp, t1->points,
+				t1->plchar, t1->sex, t1->name, t1->death);
+		if (done_stopprint)
+			continue;
+		if (rank > flags.end_top &&
+		    (rank < rank0 - flags.end_around || rank > rank0 + flags.end_around)
+		    && (!flags.end_own ||
 #ifdef PERS_IS_UID
-				  t1->uid != t0->uid ))
+			t1->uid != t0->uid))
 #else
-				  strncmp(t1->name, t0->name, NAMSZ)))
-#endif PERS_IS_UID
-	  	continue;
-	  if(rank == rank0-flags.end_around &&
-	     rank0 > flags.end_top+flags.end_around+1 &&
-	     !flags.end_own)
-		(void) putchar('\n');
-	  if(rank != rank0)
-		(void) outentry(rank, t1, 0);
-	  else if(!rank1)
-		(void) outentry(rank, t1, 1);
-	  else {
-		int t0lth = outentry(0, t0, -1);
-		int t1lth = outentry(rank, t1, t0lth);
-		if(t1lth > t0lth) t0lth = t1lth;
-		(void) outentry(0, t0, t0lth);
-	  }
+			strncmp(t1->name, t0->name, NAMSZ)))
+#endif	/* PERS_IS_UID */
+			continue;
+		if (rank == rank0 - flags.end_around &&
+		    rank0 > flags.end_top + flags.end_around + 1 &&
+		    !flags.end_own)
+			(void) putchar('\n');
+		if (rank != rank0)
+			(void) outentry(rank, t1, 0);
+		else if (!rank1)
+			(void) outentry(rank, t1, 1);
+		else {
+			int             t0lth = outentry(0, t0, -1);
+			int             t1lth = outentry(rank, t1, t0lth);
+			if (t1lth > t0lth)
+				t0lth = t1lth;
+			(void) outentry(0, t0, t0lth);
+		}
 	}
-	if(rank0 >= rank) if(!done_stopprint)
-		(void) outentry(0, t0, 1);
+	if (rank0 >= rank)
+		if (!done_stopprint)
+			(void) outentry(0, t0, 1);
 	(void) fclose(rfile);
 unlock:
 	(void) unlink(reclock);
 }
 
-outheader() {
-char linebuf[BUFSZ];
-register char *bp;
+void
+outheader()
+{
+	char            linebuf[BUFSZ];
+	char           *bp;
 	(void) strcpy(linebuf, "Number Points  Name");
 	bp = eos(linebuf);
-	while(bp < linebuf + COLNO - 9) *bp++ = ' ';
+	while (bp < linebuf + COLNO - 9)
+		*bp++ = ' ';
 	(void) strcpy(bp, "Hp [max]");
 	puts(linebuf);
 }
 
 /* so>0: standout line; so=0: ordinary line; so<0: no output, return lth */
 int
-outentry(rank,t1,so) register struct toptenentry *t1; {
-boolean quit = FALSE, killed = FALSE, starv = FALSE;
-char linebuf[BUFSZ];
+outentry(rank, t1, so)
+	struct toptenentry *t1;
+{
+	boolean         quit = FALSE, killed = FALSE, starv = FALSE;
+	char            linebuf[BUFSZ];
 	linebuf[0] = 0;
-	if(rank) Sprintf(eos(linebuf), "%3d", rank);
-		else Sprintf(eos(linebuf), "   ");
+	if (rank)
+		Sprintf(eos(linebuf), "%3d", rank);
+	else
+		Sprintf(eos(linebuf), "   ");
 	Sprintf(eos(linebuf), " %6ld %8s", t1->points, t1->name);
-	if(t1->plchar == 'X') Sprintf(eos(linebuf), " ");
-	else Sprintf(eos(linebuf), "-%c ", t1->plchar);
-	if(!strncmp("escaped", t1->death, 7)) {
-	  if(!strcmp(" (with amulet)", t1->death+7))
-	    Sprintf(eos(linebuf), "escaped the dungeon with amulet");
-	  else
-	    Sprintf(eos(linebuf), "escaped the dungeon [max level %d]",
-	      t1->maxlvl);
+	if (t1->plchar == 'X')
+		Sprintf(eos(linebuf), " ");
+	else
+		Sprintf(eos(linebuf), "-%c ", t1->plchar);
+	if (!strncmp("escaped", t1->death, 7)) {
+		if (!strcmp(" (with amulet)", t1->death + 7))
+			Sprintf(eos(linebuf), "escaped the dungeon with amulet");
+		else
+			Sprintf(eos(linebuf), "escaped the dungeon [max level %d]",
+				t1->maxlvl);
 	} else {
-	  if(!strncmp(t1->death,"quit",4)) {
-	    quit = TRUE;
-	    if(t1->maxhp < 3*t1->hp && t1->maxlvl < 4)
-	  	Sprintf(eos(linebuf), "cravenly gave up");
-	    else
-		Sprintf(eos(linebuf), "quit");
-	  }
-	  else if(!strcmp(t1->death,"choked"))
-	    Sprintf(eos(linebuf), "choked on %s food",
-		(t1->sex == 'F') ? "her" : "his");
-	  else if(!strncmp(t1->death,"starv",5))
-	    Sprintf(eos(linebuf), "starved to death"), starv = TRUE;
-	  else Sprintf(eos(linebuf), "was killed"), killed = TRUE;
-	  Sprintf(eos(linebuf), " on%s level %d",
-	    (killed || starv) ? "" : " dungeon", t1->level);
-	  if(t1->maxlvl != t1->level)
-	    Sprintf(eos(linebuf), " [max %d]", t1->maxlvl);
-	  if(quit && t1->death[4]) Sprintf(eos(linebuf), t1->death + 4);
+		if (!strncmp(t1->death, "quit", 4)) {
+			quit = TRUE;
+			if (t1->maxhp < 3 * t1->hp && t1->maxlvl < 4)
+				Sprintf(eos(linebuf), "cravenly gave up");
+			else
+				Sprintf(eos(linebuf), "quit");
+		} else if (!strcmp(t1->death, "choked"))
+			Sprintf(eos(linebuf), "choked on %s food",
+				(t1->sex == 'F') ? "her" : "his");
+		else if (!strncmp(t1->death, "starv", 5))
+			Sprintf(eos(linebuf), "starved to death"), starv = TRUE;
+		else
+			Sprintf(eos(linebuf), "was killed"), killed = TRUE;
+		Sprintf(eos(linebuf), " on%s level %d",
+			(killed || starv) ? "" : " dungeon", t1->level);
+		if (t1->maxlvl != t1->level)
+			Sprintf(eos(linebuf), " [max %d]", t1->maxlvl);
+		if (quit && t1->death[4])
+			Sprintf(eos(linebuf), t1->death + 4);
 	}
-	if(killed) Sprintf(eos(linebuf), " by %s%s",
-	  (!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4))
-		? "" :
-	  index(vowels,*t1->death) ? "an " : "a ",
-	  t1->death);
+	if (killed)
+		Sprintf(eos(linebuf), " by %s%s",
+			(!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4))
+			? "" :
+			strchr(vowels, *t1->death) ? "an " : "a ",
+			t1->death);
 	Sprintf(eos(linebuf), ".");
-	if(t1->maxhp) {
-	  register char *bp = eos(linebuf);
-	  char hpbuf[10];
-	  int hppos;
-	  Sprintf(hpbuf, (t1->hp > 0) ? itoa(t1->hp) : "-");
-	  hppos = COLNO - 7 - strlen(hpbuf);
-	  if(bp <= linebuf + hppos) {
-	    while(bp < linebuf + hppos) *bp++ = ' ';
-	    (void) strcpy(bp, hpbuf);
-	    Sprintf(eos(bp), " [%d]", t1->maxhp);
-	  }
+	if (t1->maxhp) {
+		char           *bp = eos(linebuf);
+		char            hpbuf[10];
+		int             hppos;
+		Sprintf(hpbuf, (t1->hp > 0) ? itoa(t1->hp) : "-");
+		hppos = COLNO - 7 - strlen(hpbuf);
+		if (bp <= linebuf + hppos) {
+			while (bp < linebuf + hppos)
+				*bp++ = ' ';
+			(void) strcpy(bp, hpbuf);
+			Sprintf(eos(bp), " [%d]", t1->maxhp);
+		}
 	}
-	if(so == 0) puts(linebuf);
-	else if(so > 0) {
-	  register char *bp = eos(linebuf);
-	  if(so >= COLNO) so = COLNO-1;
-	  while(bp < linebuf + so) *bp++ = ' ';
-	  *bp = 0;
-	  standoutbeg();
-	  fputs(linebuf,stdout);
-	  standoutend();
-	  (void) putchar('\n');
+	if (so == 0)
+		puts(linebuf);
+	else if (so > 0) {
+		char           *bp = eos(linebuf);
+		if (so >= COLNO)
+			so = COLNO - 1;
+		while (bp < linebuf + so)
+			*bp++ = ' ';
+		*bp = 0;
+		standoutbeg();
+		fputs(linebuf, stdout);
+		standoutend();
+		(void) putchar('\n');
 	}
-	return(strlen(linebuf));
+	return (strlen(linebuf));
 }
 
-char *
-itoa(a) int a; {
-static char buf[12];
-	Sprintf(buf,"%d",a);
-	return(buf);
+char           *
+itoa(a)
+	int             a;
+{
+	static char     buf[12];
+	Sprintf(buf, "%d", a);
+	return (buf);
 }
 
-char *
-ordin(n) int n; {
-register int d = n%10;
-	return((d==0 || d>3 || n/10==1) ? "th" : (d==1) ? "st" :
-		(d==2) ? "nd" : "rd");
+char           *
+ordin(n)
+	int             n;
+{
+	int             d = n % 10;
+	return ((d == 0 || d > 3 || n / 10 == 1) ? "th" : (d == 1) ? "st" :
+		(d == 2) ? "nd" : "rd");
 }
 
-clearlocks(){
-register x;
-	(void) signal(SIGHUP,SIG_IGN);
-	for(x = maxdlevel; x >= 0; x--) {
+void
+clearlocks()
+{
+	int x;
+	(void) signal(SIGHUP, SIG_IGN);
+	for (x = maxdlevel; x >= 0; x--) {
 		glo(x);
 		(void) unlink(lock);	/* not all levels need be present */
 	}
 }
 
 #ifdef NOSAVEONHANGUP
-hangup()
+/*ARGSUSED*/
+void
+hangup(n)
+	int n;
 {
 	(void) signal(SIGINT, SIG_IGN);
 	clearlocks();
 	exit(1);
 }
-#endif NOSAVEONHANGUP
+#endif	/* NOSAVEONHANGUP */
 
-char *
+char           *
 eos(s)
-register char *s;
+	char           *s;
 {
-	while(*s) s++;
-	return(s);
+	while (*s)
+		s++;
+	return (s);
 }
 
 /* it is the callers responsibility to check that there is room for c */
-charcat(s,c) register char *s, c; {
-	while(*s) s++;
+void
+charcat(s, c)
+	char           *s, c;
+{
+	while (*s)
+		s++;
 	*s++ = c;
 	*s = 0;
 }
@@ -507,141 +584,151 @@ charcat(s,c) register char *s, c; {
  * requested. Otherwise, find scores for the current player (and list them
  * if argc == -1).
  */
-prscore(argc,argv) int argc; char **argv; {
-	extern char *hname;
-	char **players;
-	int playerct;
-	int rank;
-	register struct toptenentry *t1, *t2;
-	char *recfile = RECORD;
-	FILE *rfile;
-	register flg = 0;
-	register int i;
+void
+prscore(argc, argv)
+	int             argc;
+	char          **argv;
+{
+	char          **players = NULL;
+	int             playerct;
+	int             rank;
+	struct toptenentry *t1, *t2;
+	char           *recfile = RECORD;
+	FILE           *rfile;
+	int		flg = 0;
+	int             i;
 #ifdef nonsense
-	long total_score = 0L;
-	char totchars[10];
-	int totcharct = 0;
-#endif nonsense
-	int outflg = (argc >= -1);
+	long            total_score = 0L;
+	char            totchars[10];
+	int             totcharct = 0;
+#endif	/* nonsense */
+	int             outflg = (argc >= -1);
 #ifdef PERS_IS_UID
-	int uid = -1;
+	int             uid = -1;
 #else
-	char *player0;
-#endif PERS_IS_UID
+	char           *player0;
+#endif	/* PERS_IS_UID */
 
-	if(!(rfile = fopen(recfile,"r"))){
+	if (!(rfile = fopen(recfile, "r"))) {
 		puts("Cannot open record file!");
 		return;
 	}
-
-	if(argc > 1 && !strncmp(argv[1], "-s", 2)){
-		if(!argv[1][2]){
+	if (argc > 1 && !strncmp(argv[1], "-s", 2)) {
+		if (!argv[1][2]) {
 			argc--;
 			argv++;
-		} else if(!argv[1][3] && index("CFKSTWX", argv[1][2])) {
+		} else if (!argv[1][3] && strchr("CFKSTWX", argv[1][2])) {
 			argv[1]++;
 			argv[1][0] = '-';
-		} else	argv[1] += 2;
+		} else
+			argv[1] += 2;
 	}
-	if(argc <= 1){
+	if (argc <= 1) {
 #ifdef PERS_IS_UID
 		uid = getuid();
 		playerct = 0;
 #else
 		player0 = plname;
-		if(!*player0)
+		if (!*player0)
 			player0 = "hackplayer";
 		playerct = 1;
 		players = &player0;
-#endif PERS_IS_UID
+#endif	/* PERS_IS_UID */
 	} else {
 		playerct = --argc;
 		players = ++argv;
 	}
-	if(outflg) putchar('\n');
+	if (outflg)
+		putchar('\n');
 
 	t1 = tt_head = newttentry();
-	for(rank = 1; ; rank++) {
-	  if(fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]",
-		t1->date, &t1->uid,
-		&t1->level, &t1->maxlvl,
-		&t1->hp, &t1->maxhp, &t1->points,
-		&t1->plchar, &t1->sex, t1->name, t1->death) != 11)
+	for (rank = 1;; rank++) {
+		if (fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]",
+			   t1->date, &t1->uid,
+			   &t1->level, &t1->maxlvl,
+			   &t1->hp, &t1->maxhp, &t1->points,
+			   &t1->plchar, &t1->sex, t1->name, t1->death) != 11)
 			t1->points = 0;
-	  if(t1->points == 0) break;
+		if (t1->points == 0)
+			break;
 #ifdef PERS_IS_UID
-	  if(!playerct && t1->uid == uid)
-		flg++;
-	  else
-#endif PERS_IS_UID
-	  for(i = 0; i < playerct; i++){
-		if(strcmp(players[i], "all") == 0 ||
-		   strncmp(t1->name, players[i], NAMSZ) == 0 ||
-		  (players[i][0] == '-' &&
-		   players[i][1] == t1->plchar &&
-		   players[i][2] == 0) ||
-		  (digit(players[i][0]) && rank <= atoi(players[i])))
+		if (!playerct && t1->uid == uid)
 			flg++;
-	  }
-	  t1 = t1->tt_next = newttentry();
+		else
+#endif	/* PERS_IS_UID */
+			for (i = 0; i < playerct; i++) {
+				if (strcmp(players[i], "all") == 0 ||
+				strncmp(t1->name, players[i], NAMSZ) == 0 ||
+				    (players[i][0] == '-' &&
+				     players[i][1] == t1->plchar &&
+				     players[i][2] == 0) ||
+				    (digit(players[i][0]) && rank <= atoi(players[i])))
+					flg++;
+			}
+		t1 = t1->tt_next = newttentry();
 	}
 	(void) fclose(rfile);
-	if(!flg) {
-	    if(outflg) {
-		printf("Cannot find any entries for ");
-		if(playerct < 1) printf("you.\n");
-		else {
-		  if(playerct > 1) printf("any of ");
-		  for(i=0; i<playerct; i++)
-			printf("%s%s", players[i], (i<playerct-1)?", ":".\n");
-		  printf("Call is: %s -s [playernames]\n", hname);
+	if (!flg) {
+		if (outflg) {
+			printf("Cannot find any entries for ");
+			if (playerct < 1)
+				printf("you.\n");
+			else {
+				if (playerct > 1)
+					printf("any of ");
+				for (i = 0; i < playerct; i++)
+					printf("%s%s", players[i], (i < playerct - 1) ? ", " : ".\n");
+				printf("Call is: %s -s [playernames]\n", hname);
+			}
 		}
-	    }
-	    return;
+		return;
 	}
-
-	if(outflg) outheader();
+	if (outflg)
+		outheader();
 	t1 = tt_head;
-	for(rank = 1; t1->points != 0; rank++, t1 = t2) {
+	for (rank = 1; t1->points != 0; rank++, t1 = t2) {
 		t2 = t1->tt_next;
 #ifdef PERS_IS_UID
-		if(!playerct && t1->uid == uid)
+		if (!playerct && t1->uid == uid)
 			goto outwithit;
 		else
-#endif PERS_IS_UID
-		for(i = 0; i < playerct; i++){
-			if(strcmp(players[i], "all") == 0 ||
-			   strncmp(t1->name, players[i], NAMSZ) == 0 ||
-			  (players[i][0] == '-' &&
-			   players[i][1] == t1->plchar &&
-			   players[i][2] == 0) ||
-			  (digit(players[i][0]) && rank <= atoi(players[i]))){
+#endif	/* PERS_IS_UID */
+			for (i = 0; i < playerct; i++) {
+				if (strcmp(players[i], "all") == 0 ||
+				strncmp(t1->name, players[i], NAMSZ) == 0 ||
+				    (players[i][0] == '-' &&
+				     players[i][1] == t1->plchar &&
+				     players[i][2] == 0) ||
+				    (digit(players[i][0]) && rank <= atoi(players[i]))) {
 			outwithit:
-				if(outflg)
-				    (void) outentry(rank, t1, 0);
+					if (outflg)
+						(void) outentry(rank, t1, 0);
 #ifdef nonsense
-				total_score += t1->points;
-				if(totcharct < sizeof(totchars)-1)
-				    totchars[totcharct++] = t1->plchar;
-#endif nonsense
-				break;
+					total_score += t1->points;
+					if (totcharct < sizeof(totchars) - 1)
+						totchars[totcharct++] = t1->plchar;
+#endif	/* nonsense */
+					break;
+				}
 			}
-		}
 		free((char *) t1);
 	}
 #ifdef nonsense
 	totchars[totcharct] = 0;
 
-	/* We would like to determine whether he is experienced. However,
-	   the information collected here only tells about the scores/roles
-	   that got into the topten (top 100?). We should maintain a
-	   .hacklog or something in his home directory. */
+	/*
+	 * We would like to determine whether he is experienced. However, the
+	 * information collected here only tells about the scores/roles that
+	 * got into the topten (top 100?). We should maintain a .hacklog or
+	 * something in his home directory.
+	 */
 	flags.beginner = (total_score < 6000);
-	for(i=0; i<6; i++)
-	    if(!index(totchars, "CFKSTWX"[i])) {
-		flags.beginner = 1;
-		if(!pl_character[0]) pl_character[0] = "CFKSTWX"[i];
-		break;
-	}
-#endif nonsense
+	for (i = 0; i < 6; i++)
+		if (!strchr(totchars, "CFKSTWX"[i])) {
+			flags.beginner = 1;
+			if (!pl_character[0])
+				pl_character[0] = "CFKSTWX"[i];
+			break;
+		}
+#endif	/* nonsense */
 }