Remove unnecessary casts, and add necessary ones for printf arguments.

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

diff --git a/wump/wump.c b/wump/wump.c
index d950f9581615577537f765ccda9b2c8c1076d80e..c1918920d83585fe2afd320ed391e3e0b145f9dc 100644 (file)
--- a/wump/wump.c
+++ b/wump/wump.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: wump.c,v 1.8 1999/02/10 01:44:34 hubertf Exp $ */
+/*     $NetBSD: wump.c,v 1.12 1999/09/12 09:02:24 jsm Exp $    */
 
 /*
  * Copyright (c) 1989, 1993
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)wump.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: wump.c,v 1.8 1999/02/10 01:44:34 hubertf Exp $");
+__RCSID("$NetBSD: wump.c,v 1.12 1999/09/12 09:02:24 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,6 +64,7 @@ __RCSID("$NetBSD: wump.c,v 1.8 1999/02/10 01:44:34 hubertf Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include "pathnames.h"
 
@@ -146,6 +147,9 @@ main(argc, argv)
 {
        int c;
 
+       /* Revoke setgid privileges */
+       setregid(getgid(), getgid());
+
 #ifdef DEBUG
        while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1)
 #else
@@ -720,7 +724,7 @@ int
 int_compare(a, b)
        const void *a, *b;
 {
-       return(*(int *)a < *(int *)b ? -1 : 1);
+       return(*(const int *)a < *(const int *)b ? -1 : 1);
 }
 
 void
@@ -745,7 +749,7 @@ puff of greasy black smoke! (poof)\n");
                return;
        }
 
-       if (!isatty(1))
+       if (!isatty(STDOUT_FILENO))
                pager = "cat";
        else {
                if (!(pager = getenv("PAGER")) || (*pager == 0))
@@ -755,7 +759,7 @@ puff of greasy black smoke! (poof)\n");
        case 0: /* child */
                if ((fd = open(_PATH_WUMPINFO, O_RDONLY)) == -1)
                        err(1, "open %s", _PATH_WUMPINFO);
-               if (dup2(fd, 0) == -1)
+               if (dup2(fd, STDIN_FILENO) == -1)
                        err(1, "dup2");
                (void)execl("/bin/sh", "sh", "-c", pager, NULL);
                err(1, "exec sh -c %s", pager);