mandoc/catman.c - diff

Return to catman.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/catman.c between version 1.6 and 1.8

version 1.6, 2011/12/16 08:04:34

version 1.8, 2011/12/18 18:51:01

Line 66 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;

Line 81 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;

Line 112 main(int argc, char *argv[])

Line 115 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);

Line 124 usage(void)

Line 127 usage(void)

fprintf(stderr, "usage: %s "

"[-fv] "

"[-C file] "

"[-o path] "

"[-m manpath] "

"[-M manpath]\n",

Line 204 indexhtml(char *src, size_t ssz, char *dst, size_t dsz

Line 208 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;

Line 223 indexhtml(char *src, size_t ssz, char *dst, size_t dsz

Line 227 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;

f = (const char *)val.data + 1;

if (++f - cp >= (int)val.size)

if (NULL == memchr(f, '\0', val.size - 1))

break;

if (NULL == memchr(f, '\0', val.size - (f - cp)))

break;

src[(int)ssz] = dst[(int)dsz] = '\0';

CVSweb