X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/affbf9f6ccf3932cabfe781b99f7d654a597254c..4fe1a63ce6ffadff8b945cdf09ffd497b050f11d:/adventure/setup.c

diff --git a/adventure/setup.c b/adventure/setup.c
index 042e1e04..d949debf 100644
--- a/adventure/setup.c
+++ b/adventure/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $	*/
+/*	$NetBSD: setup.c,v 1.4 1997/10/11 01:55:30 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,15 +40,15 @@
 static char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif				/* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $";
+static char rcsid[] = "$NetBSD: setup.c,v 1.4 1997/10/11 01:55:30 lukem Exp $";
 #endif
-#endif /* not lint */
+#endif				/* not lint */
 
 /*
  * Setup: keep the structure of the original Adventure port, but use an
@@ -64,28 +64,28 @@ static char rcsid[] = "$NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $";
 #define SIG2 " *      Sterday, 6 Thrimidge S.R. 1993, 15:24"
 
 #include <stdio.h>
-#include "hdr.h"        /* SEED lives in there; keep them coordinated. */
+#include "hdr.h"		/* SEED lives in there; keep them coordinated. */
 
 #define USAGE "Usage: setup file > data.c (file is typically glorkz)\n"
 
 #define YES 1
 #define NO  0
 
-void fatal();
-
-#define LINE 10         /* How many values do we get on a line? */
+#define LINE 10			/* How many values do we get on a line? */
 
+int
 main(argc, argv)
-int argc;
-char *argv[];
+	int     argc;
+	char   *argv[];
 {
-	FILE *infile;
-	int c, count, linestart;
+	FILE   *infile;
+	int     c, count, linestart;
 
-	if (argc != 2) fatal(USAGE);
+	if (argc != 2)
+		errx(1, USAGE);
 
 	if ((infile = fopen(argv[1], "r")) == NULL)
-		fatal("Can't read file %s.\n", argv[1]);
+		err(1, "Can't read file %s.\n", argv[1]);
 	puts("/*\n * data.c: created by setup from the ascii data file.");
 	puts(SIG1);
 	puts(SIG2);
@@ -95,25 +95,23 @@ char *argv[];
 	count = 0;
 	linestart = YES;
 
-	while ((c = getc(infile)) != EOF)
-	{
-		if (linestart && c == ' ') /* Convert first spaces to tab */
-		{
+	while ((c = getc(infile)) != EOF) {
+		if (linestart && c == ' ') {	/* Convert first spaces to tab */
 			printf("0x%02x,", ('\t' ^ random()) & 0xFF);
 			while ((c = getc(infile)) == ' ' && c != EOF);
 			/* Drop the non-whitespace character through */
 			linestart = NO;
 		}
-		switch(c)
-		{
-		    case '\t':
-			linestart = NO; /* Don't need to convert spaces */
+		switch (c) {
+		case '\t':
+			linestart = NO;	/* Don't need to convert spaces */
 			break;
-		    case '\n':
-			linestart = YES; /* Ready to convert spaces again */
+		case '\n':
+			linestart = YES;	/* Ready to convert spaces
+						 * again */
 			break;
 		}
-		if (count++ % LINE == 0)   /* Finished a line? */
+		if (count++ % LINE == 0)	/* Finished a line? */
 			printf("\n\t");
 		printf("0x%02x,", (c ^ random()) & 0xFF);
 	}
@@ -121,11 +119,3 @@ char *argv[];
 	fclose(infile);
 	exit(0);
 }
-
-
-void fatal(format, arg)
-char *format;
-{
-	fprintf(stderr, format, arg);
-	exit(1);
-}