+/* $NetBSD: arithmetic.c,v 1.25 2009/08/27 00:21:45 dholland Exp $ */
+
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Eamonn McManus of Trinity College Dublin.
* 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.
*
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
+ The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
-/*static char sccsid[] = "from: @(#)arithmetic.c 5.5 (Berkeley) 2/27/91";*/
-static char rcsid[] = "$Id: arithmetic.c,v 1.4 1995/02/28 18:30:59 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: arithmetic.c,v 1.25 2009/08/27 00:21:45 dholland Exp $");
+#endif
#endif /* not lint */
/*
*/
#include <sys/types.h>
-#include <signal.h>
+#include <err.h>
#include <ctype.h>
+#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <unistd.h>
-char keylist[] = "+-x/";
-char defaultkeys[] = "+-";
-char *keys = defaultkeys;
-int nkeys = sizeof(defaultkeys) - 1;
-int rangemax = 10;
-int nright, nwrong;
-time_t qtime;
+static int getrandom(int, int, int);
+static void intr(int) __dead;
+static int opnum(int);
+static void penalise(int, int, int);
+static int problem(void);
+static void showstats(int);
+static void usage(void) __dead;
+
+static const char keylist[] = "+-x/";
+static const char defaultkeys[] = "+-";
+static const char *keys = defaultkeys;
+static int nkeys = sizeof(defaultkeys) - 1;
+static int rangemax = 10;
+static int nright, nwrong;
+static time_t qtime;
#define NQUESTS 20
/*
* bound is 10. After every NQUESTS questions, statistics on the performance
* so far are printed.
*/
-void
-main(argc, argv)
- int argc;
- char **argv;
+int
+main(int argc, char **argv)
{
- extern char *optarg;
- extern int optind;
int ch, cnt;
- void intr();
- while ((ch = getopt(argc, argv, "r:o:")) != EOF)
+ /* Revoke setgid privileges */
+ setgid(getgid());
+
+ while ((ch = getopt(argc, argv, "r:o:")) != -1)
switch(ch) {
case 'o': {
- register char *p;
+ const char *p;
for (p = keys = optarg; *p; ++p)
- if (!index(keylist, *p)) {
- (void)fprintf(stderr,
- "arithmetic: unknown key.\n");
- exit(1);
- }
+ if (!strchr(keylist, *p))
+ errx(1, "arithmetic: unknown key.");
nkeys = p - optarg;
break;
}
case 'r':
- if ((rangemax = atoi(optarg)) <= 0) {
- (void)fprintf(stderr,
- "arithmetic: invalid range.\n");
- exit(1);
- }
+ if ((rangemax = atoi(optarg)) <= 0)
+ errx(1, "arithmetic: invalid range.");
break;
case '?':
default:
for (cnt = NQUESTS; cnt--;)
if (problem() == EOF)
exit(0);
- showstats();
+ showstats(0);
}
/* NOTREACHED */
}
/* Handle interrupt character. Print score and exit. */
-void
-intr()
+static void
+intr(dummy)
+ int dummy __unused;
{
- showstats();
+ showstats(1);
exit(0);
}
/* Print score. Original `arithmetic' had a delay after printing it. */
-showstats()
+static void
+showstats(bool_sigint)
+ int bool_sigint;
{
if (nright + nwrong > 0) {
(void)printf("\n\nRights %d; Wrongs %d; Score %d%%",
(void)printf("\nTotal time %ld seconds; %.1f seconds per problem\n\n",
(long)qtime, (float)qtime / nright);
}
+ if(!bool_sigint) {
+ (void)printf("Press RETURN to continue...\n");
+ while(!getchar()) ;
+ }
(void)printf("\n");
}
* answer causes the numbers in the problem to be penalised, so that they are
* more likely to appear in subsequent problems.
*/
+static int
problem()
{
- register char *p;
+ char *p;
time_t start, finish;
int left, op, right, result;
char line[80];
+ right = left = result = 0;
op = keys[random() % nkeys];
if (op != '/')
right = getrandom(rangemax + 1, op, 1);
(void)printf("\n");
return(EOF);
}
- for (p = line; *p && isspace(*p); ++p);
- if (!isdigit(*p)) {
+ for (p = line; *p && isspace((unsigned char)*p); ++p);
+ if (!isdigit((unsigned char)*p)) {
(void)printf("Please type a number.\n");
continue;
}
* penalties themselves.
*/
-int penalty[sizeof(keylist) - 1][2];
-struct penalty {
+static int penalty[sizeof(keylist) - 1][2];
+static struct penalty {
int value, penalty; /* Penalised value and its penalty. */
struct penalty *next;
} *penlist[sizeof(keylist) - 1][2];
* operand number `operand' (0 or 1). If we run out of memory, we just
* forget about the penalty (how likely is this, anyway?).
*/
+static void
penalise(value, op, operand)
int value, op, operand;
{
struct penalty *p;
- char *malloc();
op = opnum(op);
- if ((p = (struct penalty *)malloc((u_int)sizeof(*p))) == NULL)
+ if ((p = malloc(sizeof(*p))) == NULL)
return;
p->next = penlist[op][operand];
penlist[op][operand] = p;
* as a value, or represents a position in the penalty list. If the latter,
* we find the corresponding value and return that, decreasing its penalty.
*/
+static int
getrandom(maxval, op, operand)
int maxval, op, operand;
{
int value;
- register struct penalty **pp, *p;
+ struct penalty **pp, *p;
op = opnum(op);
value = random() % (maxval + penalty[op][operand]);
* correspond to the actual sum of penalties in the list. Provide an
* obscure message.
*/
- (void)fprintf(stderr, "arithmetic: bug: inconsistent penalties\n");
- exit(1);
+ errx(1, "arithmetic: bug: inconsistent penalties.");
/* NOTREACHED */
}
/* Return an index for the character op, which is one of [+-x/]. */
+static int
opnum(op)
int op;
{
char *p;
- if (op == 0 || (p = index(keylist, op)) == NULL) {
- (void)fprintf(stderr,
- "arithmetic: bug: op %c not in keylist %s\n", op, keylist);
- exit(1);
- }
+ if (op == 0 || (p = strchr(keylist, op)) == NULL)
+ errx(1, "arithmetic: bug: op %c not in keylist %s",
+ op, keylist);
return(p - keylist);
}
/* Print usage message and quit. */
+static void
usage()
{
- (void)fprintf(stderr, "usage: arithmetic [-o +-x/] [-r range]\n");
+ (void)fprintf(stderr, "Usage: %s [-o +-x/] [-r range]\n",
+ getprogname());
exit(1);
}
git.ckatri.com / bsdgames-darwin.git / blobdiff