Further warning fix for mkdict.

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

diff --git a/boggle/mkdict/mkdict.c b/boggle/mkdict/mkdict.c
index 0b4e6644197183c8596c9a0f703f6464444bc77a..b6e7d06714f8bc7a0d4c856c0796ec2c3522c6d5 100644 (file)
--- a/boggle/mkdict/mkdict.c
+++ b/boggle/mkdict/mkdict.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $ */
+/*     $NetBSD: mkdict.c,v 1.6 1999/09/19 18:10:48 jsm Exp $   */
 
 /*-
  * Copyright (c) 1993
@@ -36,17 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
-       The Regents of the University of California.  All rights reserved.\n";
+__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[] = "@(#)mkdict.c   8.1 (Berkeley) 6/11/93";
 #else
-static char rcsid[] = "$NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $";
+__RCSID("$NetBSD: mkdict.c,v 1.6 1999/09/19 18:10:48 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,24 +62,25 @@ static char rcsid[] = "$NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <err.h>
 
 #include "bog.h"
 
+int main __P((int, char *[]));
+
 int
 main(argc, argv)
        int argc;
        char *argv[];
 {
        char *p, *q;
-       int ch, common, n, nwords;
+       int ch, common, nwords;
        int current, len, prev, qcount;
        char buf[2][MAXWORDLEN + 1];
 
        prev = 0;
        current = 1;
        buf[prev][0] = '\0';
-       if (argc == 2)
-               n = atoi(argv[1]);
 
        for (nwords = 1;
            fgets(buf[current], MAXWORDLEN + 1, stdin) != NULL; ++nwords) {
@@ -100,7 +101,7 @@ main(argc, argv)
                                if (*q != 'u')
                                        break;
                                else {
-                                       while (*q = *(q + 1))
+                                       while ((*q = *(q + 1)))
                                                q++;
                                }
                                len++;
@@ -109,7 +110,7 @@ main(argc, argv)
                }
                if (*p != '\n' || len < 3 || len > MAXWORDLEN)
                        continue;
-               if (argc == 2 && nwords % n)
+               if (argc == 2 && nwords % atoi(argv[1]))
                        continue;
 
                *p = '\0';
@@ -125,5 +126,8 @@ main(argc, argv)
                current = !current;
        }
        warnx("%d words", nwords);
+       fflush(stdout);
+       if (ferror(stdout))
+               err(1, "writing standard output");
        exit(0);
 }