summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1997-10-10 12:04:23 +0000
committerlukem <lukem@NetBSD.org>1997-10-10 12:04:23 +0000
commit952db1ec53b2365d68d84970049975065cd884f5 (patch)
tree51f9a335bb65b149a352d90968af7c5c34a0e910
parentccdde728ae3782113b7cc37dfd324b95fd647b80 (diff)
downloadbsdgames-darwin-952db1ec53b2365d68d84970049975065cd884f5.tar.gz
bsdgames-darwin-952db1ec53b2365d68d84970049975065cd884f5.tar.zst
bsdgames-darwin-952db1ec53b2365d68d84970049975065cd884f5.zip
WARNSify
-rw-r--r--boggle/boggle/bog.c19
-rw-r--r--boggle/boggle/help.c5
-rw-r--r--boggle/boggle/mach.c7
-rw-r--r--boggle/boggle/prtable.c7
-rw-r--r--boggle/boggle/timer.c6
-rw-r--r--boggle/boggle/word.c5
-rw-r--r--caesar/caesar.68
-rw-r--r--caesar/caesar.c32
8 files changed, 56 insertions, 33 deletions
diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c
index 07d6c09b..f68a6241 100644
--- a/boggle/boggle/bog.c
+++ b/boggle/boggle/bog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bog.c,v 1.6 1997/01/07 12:00:29 tls Exp $ */
+/* $NetBSD: bog.c,v 1.7 1997/10/10 12:04:23 lukem 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[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: bog.c,v 1.6 1997/01/07 12:00:29 tls Exp $";
+__RCSID("$NetBSD: bog.c,v 1.7 1997/10/10 12:04:23 lukem Exp $");
#endif
#endif /* not lint */
@@ -61,7 +61,8 @@ static char rcsid[] = "$NetBSD: bog.c,v 1.6 1997/01/07 12:00:29 tls Exp $";
#include "bog.h"
#include "extern.h"
-static int compar __P((const void *, const void *));
+static int compar __P((const void *, const void *));
+ int main __P((int, char *[]));
struct dictindex dictindex[26];
@@ -131,12 +132,13 @@ main(argc, argv)
int ch, done, i, selfuse, sflag;
char *bspec, *p;
+ seed = 0;
batch = debug = reuse = selfuse = sflag = 0;
bspec = NULL;
minlength = 3;
tlimit = 180; /* 3 minutes is standard */
- while ((ch = getopt(argc, argv, "bds:t:w:")) != EOF)
+ while ((ch = getopt(argc, argv, "bds:t:w:")) != -1)
switch(ch) {
case 'b':
batch = 1;
@@ -594,7 +596,8 @@ checkdict()
}
mword[nmwords++] = mwordsp;
p = w;
- while (*mwordsp++ = *p++);
+ while ((*mwordsp++ = *p++) != NULL)
+ ;
}
}
diff --git a/boggle/boggle/help.c b/boggle/boggle/help.c
index b7de8a2e..8e64afaa 100644
--- a/boggle/boggle/help.c
+++ b/boggle/boggle/help.c
@@ -1,4 +1,4 @@
-/* $NetBSD: help.c,v 1.2 1995/03/21 12:14:38 cgd Exp $ */
+/* $NetBSD: help.c,v 1.3 1997/10/10 12:04:26 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -36,11 +36,12 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 6/11/93";
#else
-static char rcsid[] = "$NetBSD: help.c,v 1.2 1995/03/21 12:14:38 cgd Exp $";
+__RCSID("$NetBSD: help.c,v 1.3 1997/10/10 12:04:26 lukem Exp $");
#endif
#endif /* not lint */
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index 73c919c6..9d510267 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mach.c,v 1.5 1995/04/28 22:28:48 mycroft Exp $ */
+/* $NetBSD: mach.c,v 1.6 1997/10/10 12:04:31 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -36,11 +36,12 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93";
#else
-static char rcsid[] = "$NetBSD: mach.c,v 1.5 1995/04/28 22:28:48 mycroft Exp $";
+__RCSID("$NetBSD: mach.c,v 1.6 1997/10/10 12:04:31 lukem Exp $");
#endif
#endif /* not lint */
@@ -49,6 +50,8 @@ static char rcsid[] = "$NetBSD: mach.c,v 1.5 1995/04/28 22:28:48 mycroft Exp $";
*
* Input is raw and unechoed
*/
+#include <sys/ioctl.h>
+
#include <ctype.h>
#include <curses.h>
#include <fcntl.h>
diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c
index 6b049d17..2a5dc807 100644
--- a/boggle/boggle/prtable.c
+++ b/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prtable.c,v 1.2 1995/03/21 12:14:42 cgd Exp $ */
+/* $NetBSD: prtable.c,v 1.3 1997/10/10 12:04:33 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -38,6 +38,11 @@
* @(#)prtable.c 8.1 (Berkeley) 6/11/93
*/
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: prtable.c,v 1.3 1997/10/10 12:04:33 lukem Exp $");
+#endif /* not lint */
+
#include <curses.h>
#include "extern.h"
diff --git a/boggle/boggle/timer.c b/boggle/boggle/timer.c
index 6f9a0430..dcf3fb1f 100644
--- a/boggle/boggle/timer.c
+++ b/boggle/boggle/timer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.3 1995/04/24 12:22:45 cgd Exp $ */
+/* $NetBSD: timer.c,v 1.4 1997/10/10 12:04:36 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -36,11 +36,12 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)timer.c 8.2 (Berkeley) 2/22/94";
#else
-static char rcsid[] = "$NetBSD: timer.c,v 1.3 1995/04/24 12:22:45 cgd Exp $";
+__RCSID("$NetBSD: timer.c,v 1.4 1997/10/10 12:04:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -49,6 +50,7 @@ static char rcsid[] = "$NetBSD: timer.c,v 1.3 1995/04/24 12:22:45 cgd Exp $";
#include <curses.h>
#include <setjmp.h>
+#include <string.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/boggle/boggle/word.c b/boggle/boggle/word.c
index 9ad16f19..2942608c 100644
--- a/boggle/boggle/word.c
+++ b/boggle/boggle/word.c
@@ -1,4 +1,4 @@
-/* $NetBSD: word.c,v 1.2 1995/03/21 12:14:45 cgd Exp $ */
+/* $NetBSD: word.c,v 1.3 1997/10/10 12:04:39 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -36,11 +36,12 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)word.c 8.1 (Berkeley) 6/11/93";
#else
-static char rcsid[] = "$NetBSD: word.c,v 1.2 1995/03/21 12:14:45 cgd Exp $";
+__RCSID("$NetBSD: word.c,v 1.3 1997/10/10 12:04:39 lukem Exp $");
#endif
#endif /* not lint */
diff --git a/caesar/caesar.6 b/caesar/caesar.6
index 12615368..e62f4957 100644
--- a/caesar/caesar.6
+++ b/caesar/caesar.6
@@ -1,4 +1,4 @@
-.\" $NetBSD: caesar.6,v 1.4 1995/03/21 15:08:20 cgd Exp $
+.\" $NetBSD: caesar.6,v 1.5 1997/10/10 12:07:08 lukem Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,14 +40,14 @@
.Nm caesar
.Nd decrypt caesar cyphers
.Sh SYNOPSIS
-.Nm caesar
+.Nm
.Op Ar rotation
.Sh DESCRIPTION
The
-.Nm caesar
+.Nm
utility attempts to decrypt caesar cyphers using English letter frequency
statistics.
-.Nm Caesar
+.Nm
reads from the standard input and writes to the standard output.
.Pp
The optional numerical argument
diff --git a/caesar/caesar.c b/caesar/caesar.c
index 2d4772e7..e2355fdc 100644
--- a/caesar/caesar.c
+++ b/caesar/caesar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: caesar.c,v 1.4 1996/02/06 22:47:15 jtc Exp $ */
+/* $NetBSD: caesar.c,v 1.5 1997/10/10 12:07:11 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,25 +41,27 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+ The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: caesar.c,v 1.4 1996/02/06 22:47:15 jtc Exp $";
+__RCSID("$NetBSD: caesar.c,v 1.5 1997/10/10 12:07:11 lukem Exp $");
#endif
#endif /* not lint */
+#include <ctype.h>
+#include <errno.h>
#include <math.h>
#include <stdio.h>
-#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
#define LINELENGTH 2048
#define ROTATE(ch, perm) \
@@ -76,15 +78,20 @@ double stdf[26] = {
2.62, 0.81, 1.88, 0.23, 2.07, 0.06,
};
+
+int main __P((int, char *[]));
+void printit __P((char *));
+
+int
main(argc, argv)
int argc;
char **argv;
{
- register int ch, dot, i, nread, winnerdot;
- register char *inbuf;
+ int ch, dot, i, nread, winnerdot;
+ char *inbuf;
int obs[26], try, winner;
- char *malloc(), *strerror();
+ winnerdot = 0;
if (argc > 1)
printit(argv[1]);
@@ -98,7 +105,7 @@ main(argc, argv)
stdf[i] = log(stdf[i]) + log(26.0 / 100.0);
/* zero out observation table */
- bzero(obs, 26 * sizeof(int));
+ memset(obs, 0, 26 * sizeof(int));
if ((nread = read(STDIN_FILENO, inbuf, LINELENGTH)) < 0) {
(void)fprintf(stderr, "caesar: %s\n", strerror(errno));
@@ -145,10 +152,11 @@ main(argc, argv)
exit(0);
}
+void
printit(arg)
char *arg;
{
- register int ch, rot;
+ int ch, rot;
if ((rot = atoi(arg)) < 0) {
(void)fprintf(stderr, "caesar: bad rotation value.\n");