CVS commit: [netbsd-8] src/libexec/makewhatis

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sun Nov 18 11:58:20 UTC 2018

Modified Files:
        src/libexec/makewhatis [netbsd-8]: makewhatis.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.20.1 src/libexec/makewhatis/makewhatis.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/libexec/makewhatis/makewhatis.c
diff -u src/libexec/makewhatis/makewhatis.c:1.49 src/libexec/makewhatis/makewhatis.c:1.49.20.1
--- src/libexec/makewhatis/makewhatis.c:1.49	Mon Jun 24 20:57:47 2013
+++ src/libexec/makewhatis/makewhatis.c	Sun Nov 18 11:58:20 2018
@@ -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 @@ __RCSID("$NetBSD: makewhatis.c,v 1.49 20
 #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 void	addwhatis(whatis **, char *,
 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 @@ makewhatisline(const char *file, const c
 }
 
 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 @@ manpreprocess(char *line)
 }
 
 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 @@ nroff(const char *inname, gzFile *in)
 }
 
 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 @@ parsemanpage(const char *name, gzFile *i
 static char *
 getwhatisdata(char *name)
 {
-	gzFile	*in;
+	gzFile	in;
 	char	*data;
 	int	 section;