summaryrefslogtreecommitdiff
path: root/games/adventure/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'games/adventure/setup.c')
-rw-r--r--games/adventure/setup.c46
1 files changed, 19 insertions, 27 deletions
diff --git a/games/adventure/setup.c b/games/adventure/setup.c
index a5a520c07b7..dcf2ad68307 100644
--- a/games/adventure/setup.c
+++ b/games/adventure/setup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setup.c,v 1.4 1998/08/31 02:29:44 pjanzen Exp $ */
/* $NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#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[] = "$OpenBSD: setup.c,v 1.4 1998/08/31 02:29:44 pjanzen Exp $";
#endif
#endif /* not lint */
@@ -63,29 +64,31 @@ static char rcsid[] = "$NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $";
#define SIG1 " * Jim Gillogly"
#define SIG2 " * Sterday, 6 Thrimidge S.R. 1993, 15:24"
+#include <err.h>
#include <stdio.h>
+#include <stdlib.h>
#include "hdr.h" /* SEED lives in there; keep them coordinated. */
-#define USAGE "Usage: setup file > data.c (file is typically glorkz)\n"
+#define USAGE "Usage: setup file > data.c (file is typically glorkz)"
#define YES 1
#define NO 0
-void fatal();
-
#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.", argv[1]);
puts("/*\n * data.c: created by setup from the ascii data file.");
puts(SIG1);
puts(SIG2);
@@ -95,39 +98,28 @@ char *argv[];
count = 0;
linestart = YES;
- while ((c = getc(infile)) != EOF)
- {
+ while ((c = getc(infile)) != EOF) {
if (count++ % LINE == 0)
printf("\n\t");
- if (linestart && c == ' ') /* Convert first spaces to tab */
- {
+ 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':
+ switch (c) {
+ case '\t':
linestart = NO; /* Don't need to convert spaces */
break;
- case '\n':
+ case '\n':
linestart = YES; /* Ready to convert spaces again */
break;
}
if (count++ % LINE == 0)
printf("\n\t");
- printf("0x%02x,", (c ^ random()) & 0xFF);
+ printf("0x%02lx,", (c ^ random()) & 0xFF);
}
puts("\n\t0\n};");
fclose(infile);
exit(0);
}
-
-
-void fatal(format, arg)
-char *format;
-{
- fprintf(stderr, format, arg);
- exit(1);
-}