 @@ -1,14 +1,14 @@
-/*	$NetBSD: makewhatis.c,v 1.45 2008/11/16 06:17:05 dholland Exp $	*/
+/*	$NetBSD: makewhatis.c,v 1.46 2008/11/16 06:26:12 dholland 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,27 +27,27 @@
  * 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.45 2008/11/16 06:17:05 dholland Exp $");
+__RCSID("$NetBSD: makewhatis.c,v 1.46 2008/11/16 06:26:12 dholland 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>
 @@ -61,58 +61,58 @@ __RCSID("$NetBSD: makewhatis.c,v 1.45 20
 #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 {
-	manpage *mp_left,*mp_right;
+	manpage *mp_left, *mp_right;
 	ino_t	 mp_inode;
 	size_t	 mp_sdoff;
 	size_t	 mp_sdlen;
 	char	 mp_name[1];
 };
 typedef struct whatisstruct whatis;
 struct whatisstruct {
-	whatis	*wi_left,*wi_right;
+	whatis	*wi_left, *wi_right;
 	char	*wi_data;
 	char	wi_prefix[1];
 };
 int		main(int, char * const *);
 static char	*findwhitespace(char *);
-static char	*strmove(char *,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 int	manpreprocess(char *);
 static char	*nroff(const char *, gzFile *);
 static char	*parsemanpage(const char *, gzFile *, int);
 static char	*getwhatisdata(char *);
-static void	processmanpages(manpage **,whatis **);
+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";
 static int		dowarn      = 0;
 @@ -150,30 +150,30 @@ main(int argc, char *const *argv)
 			dofork = 0;
 			break;
 		case 'w':
 			dowarn++;
 			break;
 		default:
 			fprintf(stderr, "Usage: %s [-fw] [-C file] [manpath ...]\n",
 				getprogname());
 			exit(EXIT_FAILURE);
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc >= 1) {
 		manpath = &argv[0];
 	    mkwhatis:
 		return makewhatis(manpath);
+	}
 	/*
 	 * Try read config file, fallback to default_manpath[]
 	 * if man.conf not available.
 	 */
 	config(conffile);
 	if ((tp = gettag("_whatdb", 0)) == NULL) {
 		manpath = default_manpath;
 		goto mkwhatis;
+	}
 @@ -212,40 +212,40 @@ main(int argc, char *const *argv)
 			switch (fork()) {
 			case 0:
 				exit(makewhatis(paths));
 				break;
 			case -1:
 				warn("fork");
 				makewhatis(paths);
 				break;
 			default:
 				jobs++;
 				break;
+			}
+		}
 		globfree(&pg);
+	}
 	/* Wait for the childern to finish */
 	while (jobs > 0) {
 		(void)wait(&status);
 		if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
 			retval = EXIT_FAILURE;
 		jobs--;
+	}
 	return retval;
+}
 static int
 makewhatis(char * const * manpath)
+{
 	FTS	*fts;
 	FTSENT	*fe;
 	manpage *source;
 	whatis	*dest;
 	FILE	*out;
 	size_t	sdoff, sdlen;
 	int	outfd;
 @@ -267,29 +267,31 @@ makewhatis(char * const * manpath)
 					int		sl;
 					const char	*s, *lsl;
 					lsl = NULL;
 					s = &fe->fts_path[fe->fts_pathlen - 1];
 					for(sl = fe->fts_level - 1; sl > 0;
 					    sl--) {
 						s--;
 						while (s[0] != '/')
 							s--;
 						if (lsl == NULL)
 							lsl = s;
+					}
-					/* Include trailing '/', so we get
+					/*
-					 * 'arch/'. */
+					 * Include trailing '/', so we get
 					 * 'arch/'.
 					 */
 					sdoff = s + 1 - fe->fts_path;
 					sdlen = lsl - s + 1;
 				} else {
 					sdoff = 0;
 					sdlen = 0;
+				}
 				addmanpage(&source, fe->fts_statp->st_ino,
 				    fe->fts_path, sdoff, sdlen);
+			}
 			/*FALLTHROUGH*/
 		case FTS_D:
 		case FTS_DC:
 @@ -408,28 +410,28 @@ makewhatis(char * const * manpath)
 static char *
 findwhitespace(char *str)
+{
 	while (!ISSPACE(*str))
 		if (*str++ == '\0') {
 			str = NULL;
 			break;
+		}
 	return str;
+}
-static char
+static char *
-*strmove(char *dest,char *src)
+strmove(char *dest, char *src)
+{
 	return memmove(dest, src, strlen(src) + 1);
+}
 static char *
 GetS(gzFile in, char *buffer, size_t length)
+{
 	char	*ptr;
 	if (((ptr = gzgets(in, buffer, (int)length)) != NULL) && (*ptr == '\0'))
 		ptr = NULL;
 	return ptr;
 @@ -488,27 +490,27 @@ manpagesection(char *name)
+}
 static char *
 createsectionstring(char *section_id)
+{
 	char *section;
 	if (asprintf(&section, " (%s) - ", section_id) < 0)
 		err(EXIT_FAILURE, "malloc failed");
 	return section;
+}
 static void
-addmanpage(manpage **tree,ino_t inode,char *name, size_t sdoff, size_t sdlen)
+addmanpage(manpage **tree, ino_t inode, char *name, size_t sdoff, size_t sdlen)
+{
 	manpage *mp;
 	while ((mp = *tree) != NULL) {
 		if (mp->mp_inode == inode)
 			return;
 		tree = inode < mp->mp_inode ? &mp->mp_left : &mp->mp_right;
+	}
 	mp = emalloc(sizeof(manpage) + strlen(name));
 	mp->mp_left = NULL;
 	mp->mp_right = NULL;
 	mp->mp_inode = inode;
 @@ -1105,27 +1107,27 @@ static void
 processmanpages(manpage **source, whatis **dest)
+{
 	manpage *mp;
 	char sd[128];
 	mp = *source;
 	*source = NULL;
 	while (mp != NULL) {
 		manpage *obsolete;
 		char *data;
 		if (mp->mp_left != NULL)
-			processmanpages(&mp->mp_left,dest);
+			processmanpages(&mp->mp_left, dest);
 		if ((data = getwhatisdata(mp->mp_name)) != NULL) {
 			/* Pass eventual directory prefix to addwhatis() */
 			if (mp->mp_sdlen > 0 && mp->mp_sdlen < sizeof(sd)-1)
 				strlcpy(sd, &mp->mp_name[mp->mp_sdoff],
 					mp->mp_sdlen);
 			else
 				sd[0] = '\0';
 			addwhatis(dest, data, sd);
+		}
 		obsolete = mp;