=================================================================== RCS file: /cvs/mandoc/Attic/mandoc-db.c,v retrieving revision 1.3 retrieving revision 1.8 diff -u -p -r1.3 -r1.8 --- mandoc/Attic/mandoc-db.c 2011/04/03 14:18:29 1.3 +++ mandoc/Attic/mandoc-db.c 2011/04/05 14:10:52 1.8 @@ -1,4 +1,4 @@ -/* $Id: mandoc-db.c,v 1.3 2011/04/03 14:18:29 kristaps Exp $ */ +/* $Id: mandoc-db.c,v 1.8 2011/04/05 14:10:52 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -51,6 +51,11 @@ enum type { MANDOC_VARIABLE }; +#define MAN_ARGS DB *db, \ + const char *dbn, \ + DBT *key, size_t *ksz, \ + DBT *val, \ + const struct man_node *n #define MDOC_ARGS DB *db, \ const char *dbn, \ DBT *key, size_t *ksz, \ @@ -61,8 +66,12 @@ static void dbt_append(DBT *, size_t *, const char static void dbt_appendb(DBT *, size_t *, const void *, size_t); static void dbt_init(DBT *, size_t *); -static void version(void); +static void dbt_put(DB *, const char *, DBT *, DBT *); static void usage(void); +static void pman(DB *, const char *, + DBT *, size_t *, DBT *, + const char *, struct man *); +static int pman_node(MAN_ARGS); static void pmdoc(DB *, const char *, DBT *, size_t *, DBT *, const char *, struct mdoc *); @@ -208,6 +217,7 @@ main(int argc, char *argv[]) { struct mparse *mp; /* parse sequence */ struct mdoc *mdoc; /* resulting mdoc */ + struct man *man; /* resulting man */ char *fn; const char *dir; /* result dir (default: cwd) */ char ibuf[MAXPATHLEN], /* index fname */ @@ -234,14 +244,11 @@ main(int argc, char *argv[]) dir = ""; - while (-1 != (c = getopt(argc, argv, "d:V"))) + while (-1 != (c = getopt(argc, argv, "d:"))) switch (c) { case ('d'): dir = optarg; break; - case ('V'): - version(); - return((int)MANDOCLEVEL_OK); default: usage(); return((int)MANDOCLEVEL_BADARG); @@ -329,11 +336,13 @@ main(int argc, char *argv[]) while (NULL != (fn = *argv++)) { mparse_reset(mp); - if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) + if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) { + fprintf(stderr, "%s: Parse failure\n", fn); continue; + } - mparse_result(mp, &mdoc, NULL); - if (NULL == mdoc) + mparse_result(mp, &mdoc, &man); + if (NULL == mdoc && NULL == man) continue; rkey.data = &rec; @@ -348,7 +357,10 @@ main(int argc, char *argv[]) memset(val.data, 0, sizeof(uint32_t)); memcpy(val.data + 4, &rec, sizeof(uint32_t)); - pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc); + if (mdoc) + pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc); + else + pman(db, fbbuf, &key, &ksz, &val, fn, man); rec++; } @@ -443,20 +455,31 @@ pmdoc_Fd(MDOC_ARGS) return; if (NULL == (n = n->child) || MDOC_TEXT != n->type) return; + + /* + * Only consider those `Fd' macro fields that begin with an + * "inclusion" token (versus, e.g., #define). + */ if (strcmp("#include", n->string)) return; + if (NULL == (n = n->next) || MDOC_TEXT != n->type) return; + /* + * Strip away the enclosing angle brackets and make sure we're + * not zero-length. + */ + start = n->string; - if ('<' == *start) + if ('<' == *start || '"' == *start) start++; if (0 == (sz = strlen(start))) return; end = &start[(int)sz - 1]; - if ('>' == *end) + if ('>' == *end || '"' == *end) end--; nil = '\0'; @@ -501,7 +524,7 @@ pmdoc_Fn(MDOC_ARGS) if (NULL == cp) cp = n->child->string; - /* Ignore pointers. */ + /* Strip away pointer symbol. */ while ('*' == *cp) cp++; @@ -524,11 +547,11 @@ pmdoc_Vt(MDOC_ARGS) return; if (MDOC_Vt == n->tok && MDOC_BODY != n->type) return; - if (NULL == n->child || MDOC_TEXT != n->child->type) + if (NULL == n->last || MDOC_TEXT != n->last->type) return; /* - * Strip away leading '*' and trailing ';'. + * Strip away leading pointer symbol '*' and trailing ';'. */ start = n->last->string; @@ -597,6 +620,25 @@ pmdoc_Nm(MDOC_ARGS) memcpy(val->data, &fl, 4); } +static void +dbt_put(DB *db, const char *dbn, DBT *key, DBT *val) +{ + + if (0 == key->size) + return; + + assert(key->data); + assert(8 == val->size); + assert(val->data); + + if (0 == (*db->put)(db, key, val, 0)) + return; + + perror(dbn); + exit((int)MANDOCLEVEL_SYSERR); + /* NOTREACHED */ +} + /* * Call out to per-macro handlers after clearing the persistent database * key. If the macro sets the database key, flush it to the database. @@ -624,14 +666,8 @@ pmdoc_node(MDOC_ARGS) dbt_init(key, ksz); (*mdocs[n->tok])(db, dbn, key, ksz, val, n); - if (0 == key->size) - break; - if (0 == (*db->put)(db, key, val, 0)) - break; - - perror(dbn); - exit((int)MANDOCLEVEL_SYSERR); - /* NOTREACHED */ + dbt_put(db, dbn, key, val); + break; default: break; } @@ -640,20 +676,100 @@ pmdoc_node(MDOC_ARGS) pmdoc_node(db, dbn, key, ksz, val, n->next); } +static int +pman_node(MAN_ARGS) +{ + const struct man_node *head, *body; + const char *start; + char nil; + size_t sz; + uint32_t fl; + + if (NULL == n) + return(0); + + /* + * We're only searching for one thing: the first text child in + * the BODY of a NAME section. Since we don't keep track of + * sections in -man, run some hoops to find out whether we're in + * the correct section or not. + */ + + if (MAN_BODY == n->type && MAN_SH == n->tok) { + body = n; + assert(body->parent); + if (NULL != (head = body->parent->head) && + 1 == head->nchild && + NULL != (head = (head->child)) && + MAN_TEXT == head->type && + 0 == strcmp(head->string, "NAME") && + NULL != (body = body->child) && + MAN_TEXT == body->type) { + nil = '\0'; + + fl = MANDOC_NAME; + memcpy(val->data, &fl, 4); + + start = body->string; + + /* + * Go through a special heuristic dance here. + * This is why -man manuals are great! + * Conventionally, one or more manual names are + * comma-specified prior to a whitespace, then a + * dash, then a description. Try to puzzle out + * the name parts here. + */ + + while (start) { + sz = strcspn(start, " ,"); + if ('\0' == start[(int)sz]) + break; + + dbt_init(key, ksz); + dbt_appendb(key, ksz, start, sz); + dbt_appendb(key, ksz, &nil, 1); + + dbt_put(db, dbn, key, val); + + if (' ' == start[(int)sz]) + break; + + assert(',' == start[(int)sz]); + start += (int)sz + 1; + while (' ' == *start) + start++; + } + + return(1); + } + } + + if (pman_node(db, dbn, key, ksz, val, n->child)) + return(1); + if (pman_node(db, dbn, key, ksz, val, n->next)) + return(1); + + return(0); +} + static void -pmdoc(DB *db, const char *dbn, +pman(DB *db, const char *dbn, DBT *key, size_t *ksz, DBT *val, - const char *path, struct mdoc *m) + const char *path, struct man *m) { - pmdoc_node(db, dbn, key, ksz, val, mdoc_node(m)); + pman_node(db, dbn, key, ksz, val, man_node(m)); } + static void -version(void) +pmdoc(DB *db, const char *dbn, + DBT *key, size_t *ksz, DBT *val, + const char *path, struct mdoc *m) { - printf("%s %s\n", progname, VERSION); + pmdoc_node(db, dbn, key, ksz, val, mdoc_node(m)); } static void @@ -661,7 +777,6 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-V] " "[-d path] " "[file...]\n", progname);