===================================================================
RCS file: /cvs/mandoc/catman.c,v
retrieving revision 1.9
retrieving revision 1.11.2.2
diff -u -p -r1.9 -r1.11.2.2
--- mandoc/catman.c	2011/12/25 17:49:52	1.9
+++ mandoc/catman.c	2013/10/11 00:06:48	1.11.2.2
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.9 2011/12/25 17:49:52 kristaps Exp $ */
+/*	$Id: catman.c,v 1.11.2.2 2013/10/11 00:06:48 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__sun)
 # include <db_185.h>
 #else
 # include <db.h>
@@ -79,7 +79,7 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	aux = base = NULL;
+	aux = base = conf_file = NULL;
 	xstrlcpy(buf, "/var/www/cache/man.cgi", MAXPATHLEN);
 
 	while (-1 != (ch = getopt(argc, argv, "C:fm:M:o:v")))
@@ -212,10 +212,7 @@ indexhtml(char *src, size_t ssz, char *dst, size_t dsz
 	const char	*f;
 	char		*d;
 	char		 fname[MAXPATHLEN];
-	pid_t		 pid;
 
-	pid = -1;
-
 	xstrlcpy(fname, dst, MAXPATHLEN);
 	xstrlcat(fname, "/", MAXPATHLEN);
 	xstrlcat(fname, MANDOC_IDX, MAXPATHLEN);
@@ -380,7 +377,8 @@ manup(const struct manpaths *dirs, char *base)
 	char		 dst[MAXPATHLEN],
 			 src[MAXPATHLEN];
 	const char	*path;
-	int		 i, c;
+	size_t		 i;
+	int		 c;
 	size_t		 sz;
 	FILE		*f;