===================================================================
RCS file: /cvs/mandoc/catman.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- mandoc/catman.c	2011/12/16 08:04:34	1.6
+++ mandoc/catman.c	2011/12/18 18:51:01	1.8
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.6 2011/12/16 08:04:34 kristaps Exp $ */
+/*	$Id: catman.c,v 1.8 2011/12/18 18:51:01 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -66,7 +66,7 @@ int
 main(int argc, char *argv[])
 {
 	int		 ch;
-	char		*aux, *base;
+	char		*aux, *base, *conf_file;
 	struct manpaths	 dirs;
 	char		 buf[MAXPATHLEN];
 	extern char	*optarg;
@@ -81,8 +81,11 @@ main(int argc, char *argv[])
 	aux = base = NULL;
 	xstrlcpy(buf, "/var/www/cache/man.cgi", MAXPATHLEN);
 
-	while (-1 != (ch = getopt(argc, argv, "fm:M:o:v")))
+	while (-1 != (ch = getopt(argc, argv, "C:fm:M:o:v")))
 		switch (ch) {
+		case ('C'):
+			conf_file = optarg;
+			break;
 		case ('f'):
 			force = 1;
 			break;
@@ -112,7 +115,7 @@ main(int argc, char *argv[])
 	}
 
 	memset(&dirs, 0, sizeof(struct manpaths));
-	manpath_parse(&dirs, NULL, base, aux);
+	manpath_parse(&dirs, conf_file, base, aux);
 	ch = manup(&dirs, buf);
 	manpath_free(&dirs);
 	return(ch ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -124,6 +127,7 @@ usage(void)
 	
 	fprintf(stderr, "usage: %s "
 			"[-fv] "
+			"[-C file] "
 			"[-o path] "
 			"[-m manpath] "
 			"[-M manpath]\n",
@@ -204,7 +208,7 @@ indexhtml(char *src, size_t ssz, char *dst, size_t dsz
 	DBT		 key, val;
 	int		 c, rc;
 	unsigned int	 fl;
-	const char	*f, *cp;
+	const char	*f;
 	char		*d;
 	char		 fname[MAXPATHLEN];
 	pid_t		 pid;
@@ -223,14 +227,15 @@ indexhtml(char *src, size_t ssz, char *dst, size_t dsz
 	fl = R_FIRST;
 	while (0 == (c = (*idx->seq)(idx, &key, &val, fl))) {
 		fl = R_NEXT;
-		cp = (const char *)val.data;
+		/*
+		 * If the record is zero-length, then it's unassigned.
+		 * Skip past these.
+		 */
 		if (0 == val.size)
 			continue;
-		if (NULL == (f = memchr(cp, '\0', val.size)))
-			break;
-		if (++f - cp >= (int)val.size)
-			break;
-		if (NULL == memchr(f, '\0', val.size - (f - cp)))
+
+		f = (const char *)val.data + 1;
+		if (NULL == memchr(f, '\0', val.size - 1))
 			break;
 
 		src[(int)ssz] = dst[(int)dsz] = '\0';