version 1.6, 2011/12/16 08:04:34 |
version 1.11, 2012/06/08 10:33:48 |
|
|
#endif |
#endif |
|
|
#include "manpath.h" |
#include "manpath.h" |
|
#include "mandocdb.h" |
|
|
#define xstrlcpy(_dst, _src, _sz) \ |
#define xstrlcpy(_dst, _src, _sz) \ |
do if (strlcpy((_dst), (_src), (_sz)) >= (_sz)) { \ |
do if (strlcpy((_dst), (_src), (_sz)) >= (_sz)) { \ |
|
|
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
int ch; |
int ch; |
char *aux, *base; |
char *aux, *base, *conf_file; |
struct manpaths dirs; |
struct manpaths dirs; |
char buf[MAXPATHLEN]; |
char buf[MAXPATHLEN]; |
extern char *optarg; |
extern char *optarg; |
Line 78 main(int argc, char *argv[]) |
|
Line 79 main(int argc, char *argv[]) |
|
else |
else |
++progname; |
++progname; |
|
|
aux = base = NULL; |
aux = base = conf_file = NULL; |
xstrlcpy(buf, "/var/www/cache/man.cgi", MAXPATHLEN); |
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) { |
switch (ch) { |
|
case ('C'): |
|
conf_file = optarg; |
|
break; |
case ('f'): |
case ('f'): |
force = 1; |
force = 1; |
break; |
break; |
Line 112 main(int argc, char *argv[]) |
|
Line 116 main(int argc, char *argv[]) |
|
} |
} |
|
|
memset(&dirs, 0, sizeof(struct manpaths)); |
memset(&dirs, 0, sizeof(struct manpaths)); |
manpath_parse(&dirs, NULL, base, aux); |
manpath_parse(&dirs, conf_file, base, aux); |
ch = manup(&dirs, buf); |
ch = manup(&dirs, buf); |
manpath_free(&dirs); |
manpath_free(&dirs); |
return(ch ? EXIT_SUCCESS : EXIT_FAILURE); |
return(ch ? EXIT_SUCCESS : EXIT_FAILURE); |
|
|
|
|
fprintf(stderr, "usage: %s " |
fprintf(stderr, "usage: %s " |
"[-fv] " |
"[-fv] " |
|
"[-C file] " |
"[-o path] " |
"[-o path] " |
"[-m manpath] " |
"[-m manpath] " |
"[-M manpath]\n", |
"[-M manpath]\n", |
Line 204 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
Line 209 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
DBT key, val; |
DBT key, val; |
int c, rc; |
int c, rc; |
unsigned int fl; |
unsigned int fl; |
const char *f, *cp; |
const char *f; |
char *d; |
char *d; |
char fname[MAXPATHLEN]; |
char fname[MAXPATHLEN]; |
pid_t pid; |
pid_t pid; |
Line 212 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
Line 217 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
pid = -1; |
pid = -1; |
|
|
xstrlcpy(fname, dst, MAXPATHLEN); |
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); |
idx = dbopen(fname, O_RDONLY, 0, DB_RECNO, NULL); |
if (NULL == idx) { |
if (NULL == idx) { |
Line 223 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
Line 229 indexhtml(char *src, size_t ssz, char *dst, size_t dsz |
|
fl = R_FIRST; |
fl = R_FIRST; |
while (0 == (c = (*idx->seq)(idx, &key, &val, fl))) { |
while (0 == (c = (*idx->seq)(idx, &key, &val, fl))) { |
fl = R_NEXT; |
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) |
if (0 == val.size) |
continue; |
continue; |
if (NULL == (f = memchr(cp, '\0', val.size))) |
|
|
f = (const char *)val.data + 1; |
|
if (NULL == memchr(f, '\0', val.size - 1)) |
break; |
break; |
if (++f - cp >= (int)val.size) |
|
break; |
|
if (NULL == memchr(f, '\0', val.size - (f - cp))) |
|
break; |
|
|
|
src[(int)ssz] = dst[(int)dsz] = '\0'; |
src[(int)ssz] = dst[(int)dsz] = '\0'; |
|
|
Line 287 update(char *dst, char *src) |
|
Line 294 update(char *dst, char *src) |
|
dsz = strlen(dst); |
dsz = strlen(dst); |
ssz = strlen(src); |
ssz = strlen(src); |
|
|
xstrlcat(src, "/mandoc.db", MAXPATHLEN); |
xstrlcat(src, "/", MAXPATHLEN); |
xstrlcat(dst, "/mandoc.db", MAXPATHLEN); |
xstrlcat(dst, "/", MAXPATHLEN); |
|
|
|
xstrlcat(src, MANDOC_DB, MAXPATHLEN); |
|
xstrlcat(dst, MANDOC_DB, MAXPATHLEN); |
|
|
if ( ! filecpy(dst, src)) |
if ( ! filecpy(dst, src)) |
return(-1); |
return(-1); |
if (verbose) |
if (verbose) |
Line 297 update(char *dst, char *src) |
|
Line 307 update(char *dst, char *src) |
|
|
|
dst[(int)dsz] = src[(int)ssz] = '\0'; |
dst[(int)dsz] = src[(int)ssz] = '\0'; |
|
|
xstrlcat(src, "/mandoc.index", MAXPATHLEN); |
xstrlcat(src, "/", MAXPATHLEN); |
xstrlcat(dst, "/mandoc.index", MAXPATHLEN); |
xstrlcat(dst, "/", MAXPATHLEN); |
|
|
|
xstrlcat(src, MANDOC_IDX, MAXPATHLEN); |
|
xstrlcat(dst, MANDOC_IDX, MAXPATHLEN); |
|
|
if ( ! filecpy(dst, src)) |
if ( ! filecpy(dst, src)) |
return(-1); |
return(-1); |
if (verbose) |
if (verbose) |
Line 325 treecpy(char *dst, char *src) |
|
Line 338 treecpy(char *dst, char *src) |
|
dsz = strlen(dst); |
dsz = strlen(dst); |
ssz = strlen(src); |
ssz = strlen(src); |
|
|
xstrlcat(src, "/mandoc.index", MAXPATHLEN); |
xstrlcat(src, "/", MAXPATHLEN); |
xstrlcat(dst, "/mandoc.index", MAXPATHLEN); |
xstrlcat(dst, "/", MAXPATHLEN); |
|
|
|
xstrlcat(src, MANDOC_IDX, MAXPATHLEN); |
|
xstrlcat(dst, MANDOC_IDX, MAXPATHLEN); |
|
|
if (-1 == (rc = isnewer(dst, src))) |
if (-1 == (rc = isnewer(dst, src))) |
return(0); |
return(0); |
|
|
Line 336 treecpy(char *dst, char *src) |
|
Line 352 treecpy(char *dst, char *src) |
|
if (1 == rc) |
if (1 == rc) |
return(update(dst, src)); |
return(update(dst, src)); |
|
|
xstrlcat(src, "/mandoc.db", MAXPATHLEN); |
xstrlcat(src, "/", MAXPATHLEN); |
xstrlcat(dst, "/mandoc.db", MAXPATHLEN); |
xstrlcat(dst, "/", MAXPATHLEN); |
|
|
|
xstrlcat(src, MANDOC_DB, MAXPATHLEN); |
|
xstrlcat(dst, MANDOC_DB, MAXPATHLEN); |
|
|
if (-1 == (rc = isnewer(dst, src))) |
if (-1 == (rc = isnewer(dst, src))) |
return(0); |
return(0); |
else if (rc == 0) |
else if (rc == 0) |
Line 361 manup(const struct manpaths *dirs, char *base) |
|
Line 380 manup(const struct manpaths *dirs, char *base) |
|
char dst[MAXPATHLEN], |
char dst[MAXPATHLEN], |
src[MAXPATHLEN]; |
src[MAXPATHLEN]; |
const char *path; |
const char *path; |
int i, c; |
size_t i; |
|
int c; |
size_t sz; |
size_t sz; |
FILE *f; |
FILE *f; |
|
|