=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.176 retrieving revision 1.183 diff -u -p -r1.176 -r1.183 --- mandoc/mandocdb.c 2014/12/05 14:26:40 1.176 +++ mandoc/mandocdb.c 2015/01/15 04:26:40 1.183 @@ -1,7 +1,7 @@ -/* $Id: mandocdb.c,v 1.176 2014/12/05 14:26:40 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.183 2015/01/15 04:26:40 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons - * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze + * Copyright (c) 2011-2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -165,6 +165,7 @@ static int parse_mdoc_head(struct mpage *, const stru const struct mdoc_node *); static int parse_mdoc_Fd(struct mpage *, const struct mdoc_meta *, const struct mdoc_node *); +static void parse_mdoc_fname(struct mpage *, const struct mdoc_node *); static int parse_mdoc_Fn(struct mpage *, const struct mdoc_meta *, const struct mdoc_node *); static int parse_mdoc_Fo(struct mpage *, const struct mdoc_meta *, @@ -335,7 +336,7 @@ static const struct mdoc_handler mdocs[MDOC_MAX] = { int -main(int argc, char *argv[]) +mandocdb(int argc, char *argv[]) { int ch, i; size_t j, sz; @@ -349,7 +350,8 @@ main(int argc, char *argv[]) mpages_info.alloc = mlinks_info.alloc = hash_alloc; mpages_info.calloc = mlinks_info.calloc = hash_calloc; - mpages_info.free = mlinks_info.free = hash_free; + mpages_info.free = mlinks_info.free = hash_free; + mpages_info.data = mlinks_info.data = NULL; mpages_info.key_offset = offsetof(struct mpage, inodev); mlinks_info.key_offset = offsetof(struct mlink, file); @@ -440,7 +442,7 @@ main(int argc, char *argv[]) exitcode = (int)MANDOCLEVEL_OK; mchars = mchars_alloc(); - mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, + mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, mchars, NULL); ohash_init(&mpages, 6, &mpages_info); ohash_init(&mlinks, 6, &mlinks_info); @@ -851,6 +853,7 @@ filescan(const char *file) if (strlcpy(mlink->file, start, sizeof(mlink->file)) >= sizeof(mlink->file)) { say(start, "Filename too long"); + free(mlink); return; } @@ -1099,11 +1102,11 @@ mpages_merge(struct mparse *mp) char *cp; int fd; unsigned int pslot; - enum mandoclevel lvl; str_info.alloc = hash_alloc; str_info.calloc = hash_calloc; str_info.free = hash_free; + str_info.data = NULL; str_info.key_offset = offsetof(struct str, key); if ( ! nodb) @@ -1112,7 +1115,7 @@ mpages_merge(struct mparse *mp) mpage = ohash_first(&mpages, &pslot); while (mpage != NULL) { mlinks_undupe(mpage); - if (mpage->mlinks == NULL) { + if ((mlink = mpage->mlinks) == NULL) { mpage = ohash_next(&mpages, &pslot); continue; } @@ -1125,22 +1128,19 @@ mpages_merge(struct mparse *mp) man = NULL; sodest = NULL; - mparse_open(mp, &fd, mpage->mlinks->file); + mparse_open(mp, &fd, mlink->file); if (fd == -1) { - say(mpage->mlinks->file, "&open"); + say(mlink->file, "&open"); goto nextpage; } /* - * Try interpreting the file as mdoc(7) or man(7) - * source code, unless it is already known to be - * formatted. Fall back to formatted mode. + * Interpret the file as mdoc(7) or man(7) source + * code, unless it is known to be formatted. */ - if (mpage->mlinks->dform != FORM_CAT || - mpage->mlinks->fform != FORM_CAT) { - lvl = mparse_readfd(mp, fd, mpage->mlinks->file); - if (lvl < MANDOCLEVEL_FATAL) - mparse_result(mp, &mdoc, &man, &sodest); + if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) { + mparse_readfd(mp, fd, mlink->file); + mparse_result(mp, &mdoc, &man, &sodest); } if (sodest != NULL) { @@ -1157,7 +1157,6 @@ mpages_merge(struct mparse *mp) /* The .so target exists. */ mpage_dest = mlink_dest->mpage; - mlink = mpage->mlinks; while (1) { mlink->mpage = mpage_dest; @@ -1197,26 +1196,20 @@ mpages_merge(struct mparse *mp) mandoc_strdup(mdoc_meta(mdoc)->title); } else if (man != NULL) { mpage->form = FORM_SRC; - mpage->sec = - mandoc_strdup(man_meta(man)->msec); - mpage->arch = - mandoc_strdup(mpage->mlinks->arch); - mpage->title = - mandoc_strdup(man_meta(man)->title); + mpage->sec = mandoc_strdup(man_meta(man)->msec); + mpage->arch = mandoc_strdup(mlink->arch); + mpage->title = mandoc_strdup(man_meta(man)->title); } else { mpage->form = FORM_CAT; - mpage->sec = - mandoc_strdup(mpage->mlinks->dsec); - mpage->arch = - mandoc_strdup(mpage->mlinks->arch); - mpage->title = - mandoc_strdup(mpage->mlinks->name); + mpage->sec = mandoc_strdup(mlink->dsec); + mpage->arch = mandoc_strdup(mlink->arch); + mpage->title = mandoc_strdup(mlink->name); } putkey(mpage, mpage->sec, TYPE_sec); if (*mpage->arch != '\0') putkey(mpage, mpage->arch, TYPE_arch); - for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { + for ( ; mlink != NULL; mlink = mlink->next) { if ('\0' != *mlink->dsec) putkey(mpage, mlink->dsec, TYPE_sec); if ('\0' != *mlink->fsec) @@ -1242,11 +1235,12 @@ mpages_merge(struct mparse *mp) mlink_check(mpage, mlink); dbadd(mpage); + mlink = mpage->mlinks; nextpage: if (mparse_wait(mp) != MANDOCLEVEL_OK) { exitcode = (int)MANDOCLEVEL_SYSERR; - say(mpage->mlinks->file, "&wait gunzip"); + say(mlink->file, "&wait gunzip"); } ohash_delete(&strings); ohash_delete(&names); @@ -1640,37 +1634,39 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_m return(0); } -static int -parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta, - const struct mdoc_node *n) +static void +parse_mdoc_fname(struct mpage *mpage, const struct mdoc_node *n) { char *cp; + size_t sz; - if (NULL == (n = n->child) || MDOC_TEXT != n->type) - return(0); + if (n->type != MDOC_TEXT) + return; - /* - * Parse: .Fn "struct type *name" "char *arg". - * First strip away pointer symbol. - * Then store the function name, then type. - * Finally, store the arguments. - */ + /* Skip function pointer punctuation. */ - if (NULL == (cp = strrchr(n->string, ' '))) - cp = n->string; - - while ('*' == *cp) + cp = n->string; + while (*cp == '(' || *cp == '*') cp++; + sz = strcspn(cp, "()"); - putkey(mpage, cp, TYPE_Fn); + putkeys(mpage, cp, sz, TYPE_Fn); if (n->sec == SEC_SYNOPSIS) - putkey(mpage, cp, NAME_SYN); + putkeys(mpage, cp, sz, NAME_SYN); +} - if (n->string < cp) - putkeys(mpage, n->string, cp - n->string, TYPE_Ft); +static int +parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta, + const struct mdoc_node *n) +{ - for (n = n->next; NULL != n; n = n->next) - if (MDOC_TEXT == n->type) + if (n->child == NULL) + return(0); + + parse_mdoc_fname(mpage, n->child); + + for (n = n->child->next; n != NULL; n = n->next) + if (n->type == MDOC_TEXT) putkey(mpage, n->string, TYPE_Fa); return(0); @@ -1681,9 +1677,12 @@ parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_m const struct mdoc_node *n) { - putmdockey(mpage, n->child, TYPE_Fn); - if (n->sec == SEC_SYNOPSIS) - putmdockey(mpage, n->child, NAME_SYN); + if (n->type != MDOC_HEAD) + return(1); + + if (n->child != NULL) + parse_mdoc_fname(mpage, n->child); + return(0); }