 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,47 +27,48 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #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>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
 #include <glob.h>
 #include <locale.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <zlib.h>
 #include <util.h>
 #include <man/manconf.h>
 #include <man/pathnames.h>
 #ifndef NROFF
 #define NROFF "nroff"
 #endif
 typedef struct manpagestruct manpage;
 struct manpagestruct {
 @@ -87,30 +88,30 @@ struct whatisstruct {
 int		main(int, char * const *);
 static char	*findwhitespace(char *);
 static char	*strmove(char *, char *);
 static char	*GetS(gzFile, char *, size_t);
 static int	pathnamesection(const char *, const char *);
 static int	manpagesection(char *);
 static char	*createsectionstring(char *);
 static void	addmanpage(manpage **, ino_t, char *, size_t, size_t);
 static void	addwhatis(whatis **, char *, 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	*nroff(const char *, gzFile);
-static char	*parsemanpage(const char *, gzFile *, int);
+static char	*parsemanpage(const char *, gzFile, int);
 static char	*getwhatisdata(char *);
 static void	processmanpages(manpage **, whatis **);
 static void	dumpwhatis(FILE *, whatis *);
 static int	makewhatis(char * const *manpath);
 static char * const default_manpath[] = {
 	"/usr/share/man",
 	NULL
 };
 static const char	*sectionext = "0123456789ln";
 static const char	*whatisdb   = _PATH_WHATIS;
 static const char	*whatisdb_new = _PATH_WHATIS ".new";
 @@ -614,27 +615,27 @@ makewhatisline(const char *file, const c
 	llen = strlen(line);
 	dlen = strlen(del[i]);
 	result = emalloc(llen - dlen + slen + 1);
 	pos = ptr - line;
 	(void)memcpy(result, line, pos);
 	(void)memcpy(&result[pos], section, slen);
 	(void)strcpy(&result[pos + slen], &line[pos + dlen]);
 	return result;
+}
 static char *
-parsecatpage(const char *name, gzFile *in)
+parsecatpage(const char *name, gzFile in)
+{
 	char	 buffer[8192];
 	char	*section, *ptr, *last;
 	size_t	 size;
 	do {
 		if (GetS(in, buffer, sizeof(buffer)) == NULL)
 			return NULL;
+	}
 	while (buffer[0] == '\n');
 	section = NULL;
 	if ((ptr = strchr(buffer, '(')) != NULL) {
 @@ -759,27 +760,27 @@ manpreprocess(char *line)
 			} else {
 				to += length;
 				*to++ = ')';
 				length = strlen(trail);
 				(void) memmove(to, trail, length + 1);
+			}
+		}
+	}
 	return 0;
+}
 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;
 	static int devnull = -1;
 	pid_t child;
 	if (gzrewind(in) < 0)
 		err(EXIT_FAILURE, "Cannot rewind pipe");
 	if ((devnull < 0) &&
 	    ((devnull = open(_PATH_DEVNULL, O_WRONLY, 0)) < 0))
 		err(EXIT_FAILURE, "Cannot open `/dev/null'");
 @@ -858,27 +859,27 @@ nroff(const char *inname, gzFile *in)
 	while (waitpid(child, &status, 0) != child);
 	if ((data != NULL) &&
 	    !(WIFEXITED(status) && (WEXITSTATUS(status) == 0))) {
 		free(data);
 		errx(EXIT_FAILURE, NROFF " on `%s' exited with %d status",
 		    inname, WEXITSTATUS(status));
+	}
 	(void)unlink(tempname);
 	return data;
+}
 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";
 	static const char IX[] = ".IX TITLE";
 	section = NULL;
 	do {
 		if (GetS(in, buffer, sizeof(buffer) - 1) == NULL) {
 			free(section);
 			return NULL;
+		}
 		/*
 @@ -1087,27 +1088,27 @@ parsemanpage(const char *name, gzFile *i
+	}
 	if (section == NULL)
 		section = makesection(defaultsection);
 	ptr = makewhatisline(name, buffer, section);
 	free(section);
 	return ptr;
+}
 static char *
 getwhatisdata(char *name)
+{
-	gzFile	*in;
+	gzFile	in;
 	char	*data;
 	int	 section;
 	if ((in = gzopen(name, "r")) == NULL) {
 		if (errno == 0)
 			errno = ENOMEM;
 		err(EXIT_FAILURE, "Cannot open `%s'", name);
 		/* NOTREACHED */
+	}
 	section = manpagesection(name);
 	if (section == 0) {
 		data = parsecatpage(name, in);