Lots of minor fixes resulting from reading these man pages in detail.

[bsdgames-darwin.git] / arithmetic / arithmetic.c

diff --git a/arithmetic/arithmetic.c b/arithmetic/arithmetic.c
index a15ead5a3d3586cf688f1327a45074fb861186fb..876153a9d08834ecac64d5fd82359bd01d03d7a5 100644 (file)
--- a/arithmetic/arithmetic.c
+++ b/arithmetic/arithmetic.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: arithmetic.c,v 1.14 2000/04/14 05:58:01 simonb Exp $   */
+/*     $NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)arithmetic.c       8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: arithmetic.c,v 1.14 2000/04/14 05:58:01 simonb Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@ int   main __P((int, char *[]));
 int    opnum __P((int));
 void   penalise __P((int, int, int));
 int    problem __P((void));
-void   showstats __P((void));
+void   showstats __P((int));
 void   usage __P((void)) __attribute__((__noreturn__));
 
 const char keylist[] = "+-x/";
@@ -121,7 +121,7 @@ main(argc, argv)
        int ch, cnt;
 
        /* Revoke setgid privileges */
-       setregid(getgid(), getgid());
+       setgid(getgid());
 
        while ((ch = getopt(argc, argv, "r:o:")) != -1)
                switch(ch) {
@@ -155,7 +155,7 @@ main(argc, argv)
                for (cnt = NQUESTS; cnt--;)
                        if (problem() == EOF)
                                exit(0);
-               showstats();
+               showstats(0);
        }
        /* NOTREACHED */
 }
@@ -165,13 +165,14 @@ void
 intr(dummy)
        int dummy __attribute__((__unused__));
 {
-       showstats();
+       showstats(1);
        exit(0);
 }
 
 /* Print score.  Original `arithmetic' had a delay after printing it. */
 void
-showstats()
+showstats(bool_sigint)
+       int bool_sigint;
 {
        if (nright + nwrong > 0) {
                (void)printf("\n\nRights %d; Wrongs %d; Score %d%%",
@@ -180,6 +181,10 @@ showstats()
        (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");
 }
 
@@ -386,9 +391,7 @@ opnum(op)
 void
 usage()
 {
-       extern char *__progname;        /* from crt0.o */
-
-       (void)fprintf(stderr, "usage: %s [-o +-x/] [-r range]\n",
-               __progname);
+       (void)fprintf(stderr, "Usage: %s [-o +-x/] [-r range]\n",
+               getprogname());
        exit(1);
 }