diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-12-25 17:49:52 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-12-25 17:49:52 +0000 |
| commit | c8d73e251047e8859a65f91c95d63ae37f97e1a6 (patch) | |
| tree | bae90b1945998a3b861837b870345b45e6e6896b /catman.c | |
| parent | edc2864f44502c5d9f45664a5d58f03c4146ca27 (diff) | |
| download | mandoc-c8d73e251047e8859a65f91c95d63ae37f97e1a6.tar.gz mandoc-c8d73e251047e8859a65f91c95d63ae37f97e1a6.tar.zst mandoc-c8d73e251047e8859a65f91c95d63ae37f97e1a6.zip | |
Continue changing mandoc.{index,db} into whatis.{index,db}. Use mandocdb.h
to do so.
Diffstat (limited to 'catman.c')
| -rw-r--r-- | catman.c | 34 |
1 files changed, 24 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: catman.c,v 1.8 2011/12/18 18:51:01 kristaps Exp $ */ +/* $Id: catman.c,v 1.9 2011/12/25 17:49:52 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)) { \ @@ -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,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); |