mdocml: Continue changing mandoc.{index,db} into whatis.{index,db}.

mdocml: Continue changing mandoc.{index,db} into whatis.{index,db}.

[kristaps]

Log Message:
-----------
Continue changing mandoc.{index,db} into whatis.{index,db}.  Use mandocdb.h
to do so.

Modified Files:
--------------
    mdocml:
        Makefile
        catman.c
        cgi.c

Revision Data
-------------
Index: catman.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/catman.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lcatman.c -Lcatman.c -u -p -r1.8 -r1.9
--- catman.c
+++ catman.c
@@ -38,6 +38,7 @@
 #endif
 
 #include "manpath.h"
+#include "mandocdb.h"
 
 #define	xstrlcpy(_dst, _src, _sz) \
 	do if (strlcpy((_dst), (_src), (_sz)) >= (_sz)) { \
@@ -216,7 +217,8 @@ indexhtml(char *src, size_t ssz, char *d
 	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,8 +294,11 @@ 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);
@@ -302,8 +307,11 @@ 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);
@@ -330,8 +338,11 @@ 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);
Index: cgi.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/cgi.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lcgi.c -Lcgi.c -u -p -r1.38 -r1.39
--- cgi.c
+++ cgi.c
@@ -41,6 +41,7 @@
 #include "man.h"
 #include "main.h"
 #include "manpath.h"
+#include "mandocdb.h"
 
 #ifdef __linux__
 # include <db_185.h>
@@ -843,7 +844,8 @@ pg_show(const struct req *req, char *pat
 
 	sz = strlcpy(file, ps.paths[vol], MAXPATHLEN);
 	assert(sz < MAXPATHLEN);
-	strlcat(file, "/mandoc.index", MAXPATHLEN);
+	strlcat(file, "/", MAXPATHLEN);
+	strlcat(file, MANDOC_IDX, MAXPATHLEN);
 
 	/* Open the index recno(3) database. */
 
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.391
retrieving revision 1.392
diff -LMakefile -LMakefile -u -p -r1.391 -r1.392
--- Makefile
+++ Makefile
@@ -337,7 +337,7 @@ $(CGI_OBJS) $(CGI_LNS): main.h mdoc.h ma
 CATMAN_OBJS	 = catman.o manpath.o
 CATMAN_LNS 	 = catman.ln manpath.ln
 
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h 
+$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h mandocdb.h
 
 DEMANDOC_OBJS	 = demandoc.o
 DEMANDOC_LNS	 = demandoc.ln
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv