===================================================================
RCS file: /cvs/mandoc/catman.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -p -r1.8 -r1.10
--- mandoc/catman.c	2011/12/18 18:51:01	1.8
+++ mandoc/catman.c	2012/01/03 15:17:20	1.10
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.8 2011/12/18 18:51:01 kristaps Exp $ */
+/*	$Id: catman.c,v 1.10 2012/01/03 15:17:20 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -38,6 +38,7 @@
 #endif
 
 #include "manpath.h"
+#include "mandocdb.h"
 
 #define	xstrlcpy(_dst, _src, _sz) \
 	do if (strlcpy((_dst), (_src), (_sz)) >= (_sz)) { \
@@ -78,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")))
@@ -216,7 +217,8 @@ indexhtml(char *src, size_t ssz, char *dst, size_t dsz
 	pid = -1;
 
 	xstrlcpy(fname, dst, MAXPATHLEN);
-	xstrlcat(fname, "/mandoc.index", MAXPATHLEN);
+	xstrlcat(fname, "/", MAXPATHLEN);
+	xstrlcat(fname, MANDOC_IDX, MAXPATHLEN);
 
 	idx = dbopen(fname, O_RDONLY, 0, DB_RECNO, NULL);
 	if (NULL == idx) {
@@ -292,9 +294,12 @@ update(char *dst, char *src)
 	dsz = strlen(dst);
 	ssz = strlen(src);
 
-	xstrlcat(src, "/mandoc.db", MAXPATHLEN);
-	xstrlcat(dst, "/mandoc.db", MAXPATHLEN);
+	xstrlcat(src, "/", MAXPATHLEN);
+	xstrlcat(dst, "/", MAXPATHLEN);
 
+	xstrlcat(src, MANDOC_DB, MAXPATHLEN);
+	xstrlcat(dst, MANDOC_DB, MAXPATHLEN);
+
 	if ( ! filecpy(dst, src))
 		return(-1);
 	if (verbose)
@@ -302,9 +307,12 @@ update(char *dst, char *src)
 
 	dst[(int)dsz] = src[(int)ssz] = '\0';
 
-	xstrlcat(src, "/mandoc.index", MAXPATHLEN);
-	xstrlcat(dst, "/mandoc.index", MAXPATHLEN);
+	xstrlcat(src, "/", MAXPATHLEN);
+	xstrlcat(dst, "/", MAXPATHLEN);
 
+	xstrlcat(src, MANDOC_IDX, MAXPATHLEN);
+	xstrlcat(dst, MANDOC_IDX, MAXPATHLEN);
+
 	if ( ! filecpy(dst, src))
 		return(-1);
 	if (verbose)
@@ -330,9 +338,12 @@ treecpy(char *dst, char *src)
 	dsz = strlen(dst);
 	ssz = strlen(src);
 
-	xstrlcat(src, "/mandoc.index", MAXPATHLEN);
-	xstrlcat(dst, "/mandoc.index", MAXPATHLEN);
+	xstrlcat(src, "/", MAXPATHLEN);
+	xstrlcat(dst, "/", MAXPATHLEN);
 
+	xstrlcat(src, MANDOC_IDX, MAXPATHLEN);
+	xstrlcat(dst, MANDOC_IDX, MAXPATHLEN);
+
 	if (-1 == (rc = isnewer(dst, src)))
 		return(0);
 
@@ -341,8 +352,11 @@ treecpy(char *dst, char *src)
 	if (1 == rc)
 		return(update(dst, src));
 
-	xstrlcat(src, "/mandoc.db", MAXPATHLEN);
-	xstrlcat(dst, "/mandoc.db", MAXPATHLEN);
+	xstrlcat(src, "/", MAXPATHLEN);
+	xstrlcat(dst, "/", MAXPATHLEN);
+
+	xstrlcat(src, MANDOC_DB, MAXPATHLEN);
+	xstrlcat(dst, MANDOC_DB, MAXPATHLEN);
 
 	if (-1 == (rc = isnewer(dst, src)))
 		return(0);