[src/netbsd-8]: src/libexec/makewhatis Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc9b81d97333
branches:  netbsd-8
changeset: 445936:cc9b81d97333
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 18 11:58:20 2018 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #1096):

        libexec/makewhatis/makewhatis.c: revision 1.50
        libexec/makewhatis/makewhatis.c: revision 1.51

Include time.h for time.
XXX Doesn't build with newer zlib, remove?

 -

make this compile.

diffstat:

 libexec/makewhatis/makewhatis.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (76 lines):

diff -r 8aa37c0a0ed3 -r cc9b81d97333 libexec/makewhatis/makewhatis.c
--- a/libexec/makewhatis/makewhatis.c   Sun Nov 18 11:54:02 2018 +0000
+++ b/libexec/makewhatis/makewhatis.c   Sun Nov 18 11:58:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makewhatis.c,v 1.49 2013/06/24 20:57:47 christos Exp $ */
+/*     $NetBSD: makewhatis.c,v 1.49.20.1 2018/11/18 11:58:20 martin Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #if !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: makewhatis.c,v 1.49 2013/06/24 20:57:47 christos Exp $");
+__RCSID("$NetBSD: makewhatis.c,v 1.49.20.1 2018/11/18 11:58:20 martin Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -58,6 +58,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include <zlib.h>
 #include <util.h>
@@ -97,10 +98,10 @@
 static char    *makesection(int);
 static char    *makewhatisline(const char *, const char *, const char *);
 static void    catpreprocess(char *);
-static char    *parsecatpage(const char *, gzFile *);
+static char    *parsecatpage(const char *, gzFile);
 static int     manpreprocess(char *);
-static char    *nroff(const char *, gzFile *);
-static char    *parsemanpage(const char *, gzFile *, int);
+static char    *nroff(const char *, gzFile);
+static char    *parsemanpage(const char *, gzFile, int);
 static char    *getwhatisdata(char *);
 static void    processmanpages(manpage **, whatis **);
 static void    dumpwhatis(FILE *, whatis *);
@@ -624,7 +625,7 @@
 }
 
 static char *
-parsecatpage(const char *name, gzFile *in)
+parsecatpage(const char *name, gzFile in)
 {
        char     buffer[8192];
        char    *section, *ptr, *last;
@@ -769,7 +770,7 @@
 }
 
 static char *
-nroff(const char *inname, gzFile *in)
+nroff(const char *inname, gzFile in)
 {
        char tempname[MAXPATHLEN], buffer[65536], *data;
        int tempfd, bytes, pipefd[2], status;
@@ -868,7 +869,7 @@
 }
 
 static char *
-parsemanpage(const char *name, gzFile *in, int defaultsection)
+parsemanpage(const char *name, gzFile in, int defaultsection)
 {
        char    *section, buffer[8192], *ptr;
        static const char POD[] = ".\\\" Automatically generated by Pod";
@@ -1097,7 +1098,7 @@
 static char *
 getwhatisdata(char *name)
 {
-       gzFile  *in;
+       gzFile  in;
        char    *data;
        int      section;