Fix merge conflicts

[bsdgames-darwin.git] / boggle / mkindex / mkindex.c

diff --git a/boggle/mkindex/mkindex.c b/boggle/mkindex/mkindex.c
index 4d29da49cd4dbdd01584433c5a9b255478f53964..fad2264478f0078043a853f22a6e0beb090236f7 100644 (file)
--- a/boggle/mkindex/mkindex.c
+++ b/boggle/mkindex/mkindex.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkindex.c,v 1.2 1995/03/21 12:14:52 cgd Exp $  */
+/* $NetBSD: mkindex.c,v 1.12 2021/05/02 12:50:44 rillig Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -15,11 +15,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.
  *
@@ -37,31 +33,28 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
+static char copyright[] = "@(#) Copyright (c) 1993\n\
        The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
 
-#ifndef lint
 #if 0
 static char sccsid[] = "@(#)mkindex.c  8.1 (Berkeley) 6/11/93";
 #else
-static char rcsid[] = "$NetBSD: mkindex.c,v 1.2 1995/03/21 12:14:52 cgd Exp $";
+static char rcsid[] =
+    "$NetBSD: mkindex.c,v 1.12 2021/05/02 12:50:44 rillig Exp $";
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "bog.h"
 
-char *nextword __P((FILE *, char *, int *, int *));
+static char *nextword(FILE *, char *, int *, int *);
 
 int
-main(argc, argv)
-       int argc;
-       char *argv[];
+main(void)
 {
-       int clen, rlen, prev;
+       int clen, rlen, prev, i;
        long off, start;
        char buf[MAXWORDLEN + 1];
 
@@ -69,14 +62,29 @@ main(argc, argv)
        off = start = 0L;
        while (nextword(stdin, buf, &clen, &rlen) != NULL) {
                if (*buf != prev) {
+                       /*
+                        * Boggle expects a full index even if the dictionary
+                        * had no words beginning with some letters.
+                        * So we write out entries for every letter from prev
+                        * to *buf.
+                        */
                        if (prev != '\0')
                                printf("%c %6ld %6ld\n", prev, start, off - 1);
+                       for (i = (prev ? prev + 1 : 'a'); i < *buf; i++)
+                               printf("%c %6ld %6ld\n", i, off, off - 1);
                        prev = *buf;
                        start = off;
                }
                off += clen + 1;
        }
        printf("%c %6ld %6ld\n", prev, start, off - 1);
+       for (i = prev + 1; i <= 'z'; i++)
+               printf("%c %6ld %6ld\n", i, off, off - 1);
+       fflush(stdout);
+       if (ferror(stdout)) {
+               perror("error writing standard output");
+               exit(1);
+       }
        exit(0);
 }
 
@@ -86,14 +94,11 @@ main(argc, argv)
  * Also set clen to the length of the compressed word (for mkindex) and
  * rlen to the strlen() of the real word
  */
-char *
-nextword(fp, buffer, clen, rlen)
-       FILE *fp;
-       char *buffer;
-       int *clen, *rlen;
+static char *
+nextword(FILE *fp, char *buffer, int *clen, int *rlen)
 {
-       register int ch, pcount;
-       register char *p, *q;
+       int ch, pcount;
+       char *p, *q;
        static char buf[MAXWORDLEN + 1];
        static int first = 1;
        static int lastch = 0;
@@ -107,7 +112,7 @@ nextword(fp, buffer, clen, rlen)
                return (NULL);
 
        p = buf + (*clen = pcount);
- 
+
        while ((ch = getc(fp)) != EOF && ch >= 'a')
                        *p++ = ch;
                lastch = ch;