=================================================================== RCS file: /cvs/mandoc/Attic/mandoc-db.c,v retrieving revision 1.11 retrieving revision 1.17 diff -u -p -r1.11 -r1.17 --- mandoc/Attic/mandoc-db.c 2011/04/11 22:56:25 1.11 +++ mandoc/Attic/mandoc-db.c 2011/05/03 14:39:27 1.17 @@ -1,4 +1,4 @@ -/* $Id: mandoc-db.c,v 1.11 2011/04/11 22:56:25 kristaps Exp $ */ +/* $Id: mandoc-db.c,v 1.17 2011/05/03 14:39:27 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -48,7 +48,9 @@ enum type { MANDOC_FUNCTION, MANDOC_UTILITY, MANDOC_INCLUDES, - MANDOC_VARIABLE + MANDOC_VARIABLE, + MANDOC_STANDARD, + MANDOC_AUTHOR }; #define MAN_ARGS DB *db, \ @@ -76,12 +78,14 @@ static int pman_node(MAN_ARGS); static void pmdoc(DB *, const char *, DBT *, size_t *, DBT *, DBT *, size_t *, struct mdoc *); static void pmdoc_node(MDOC_ARGS); +static void pmdoc_An(MDOC_ARGS); static void pmdoc_Fd(MDOC_ARGS); static void pmdoc_In(MDOC_ARGS); static void pmdoc_Fn(MDOC_ARGS); static void pmdoc_Fo(MDOC_ARGS); static void pmdoc_Nd(MDOC_ARGS); static void pmdoc_Nm(MDOC_ARGS); +static void pmdoc_St(MDOC_ARGS); static void pmdoc_Vt(MDOC_ARGS); typedef void (*pmdoc_nf)(MDOC_ARGS); @@ -104,7 +108,7 @@ static const pmdoc_nf mdocs[MDOC_MAX] = { NULL, /* El */ NULL, /* It */ NULL, /* Ad */ - NULL, /* An */ + pmdoc_An, /* An */ NULL, /* Ar */ NULL, /* Cd */ NULL, /* Cm */ @@ -126,7 +130,7 @@ static const pmdoc_nf mdocs[MDOC_MAX] = { NULL, /* Ot */ NULL, /* Pa */ NULL, /* Rv */ - NULL, /* St */ + pmdoc_St, /* St */ pmdoc_Vt, /* Va */ pmdoc_Vt, /* Vt */ NULL, /* Xr */ @@ -221,6 +225,7 @@ main(int argc, char *argv[]) struct man *man; /* resulting man */ char *fn; /* current file being parsed */ const char *msec, /* manual section */ + *mtitle, /* manual title */ *dir; /* result dir (default: cwd) */ char ibuf[MAXPATHLEN], /* index fname */ ibbuf[MAXPATHLEN], /* index backup fname */ @@ -354,8 +359,12 @@ main(int argc, char *argv[]) msec = NULL != mdoc ? mdoc_meta(mdoc)->msec : man_meta(man)->msec; + mtitle = NULL != mdoc ? + mdoc_meta(mdoc)->title : + man_meta(man)->title; assert(msec); + assert(mtitle); /* * The index record value consists of a nil-terminated @@ -368,6 +377,7 @@ main(int argc, char *argv[]) dbt_init(&rval, &rsz); dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1); dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1); + dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1); sv = rval.size; /* Fix the record number in the btree value. */ @@ -451,6 +461,48 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz key->data = mandoc_realloc(key->data, *ksz); } +#if 0 + dstp = key->data + (int)key->size; + + while (NULL != (endp = memchr(cp, '\\', sz))) { + ssz = endp - cp; + memcpy(dstp, cp, ssz); + + dstp += ssz; + key->size += ssz; + sz -= ssz; + + cp = endp++; + /* FIXME: expects nil-terminated string! */ + esc = mandoc_escape((const char **)&endp, NULL, NULL); + + switch (esc) { + case (ESCAPE_ERROR): + /* Nil-terminate this point. */ + memcpy(dstp, "", 1); + key->size++; + return; + case (ESCAPE_PREDEF): + /* FALLTHROUGH */ + case (ESCAPE_SPECIAL): + break; + default: + sz -= endp - cp; + cp = endp; + continue; + } + + ssz = endp - cp; + memcpy(dstp, cp, ssz); + + dstp += ssz; + key->size += ssz; + sz -= ssz; + + cp = endp; + } +#endif + memcpy(key->data + (int)key->size, cp, sz); key->size += sz; } @@ -478,12 +530,28 @@ dbt_append(DBT *key, size_t *ksz, const char *cp) /* ARGSUSED */ static void +pmdoc_An(MDOC_ARGS) +{ + uint32_t fl; + + if (SEC_AUTHORS != n->sec) + return; + + for (n = n->child; n; n = n->next) + if (MDOC_TEXT == n->type) + dbt_append(key, ksz, n->string); + + fl = MANDOC_AUTHOR; + memcpy(val->data, &fl, 4); +} + +/* ARGSUSED */ +static void pmdoc_Fd(MDOC_ARGS) { uint32_t fl; const char *start, *end; size_t sz; - const char nil = '\0'; if (SEC_SYNOPSIS != n->sec) return; @@ -517,7 +585,7 @@ pmdoc_Fd(MDOC_ARGS) end--; dbt_appendb(key, ksz, start, end - start + 1); - dbt_appendb(key, ksz, &nil, 1); + dbt_appendb(key, ksz, "", 1); fl = MANDOC_INCLUDES; memcpy(val->data, &fl, 4); @@ -569,12 +637,27 @@ pmdoc_Fn(MDOC_ARGS) /* ARGSUSED */ static void +pmdoc_St(MDOC_ARGS) +{ + uint32_t fl; + + if (SEC_STANDARDS != n->sec) + return; + if (NULL == n->child || MDOC_TEXT != n->child->type) + return; + + dbt_append(key, ksz, n->child->string); + fl = MANDOC_STANDARD; + memcpy(val->data, &fl, 4); +} + +/* ARGSUSED */ +static void pmdoc_Vt(MDOC_ARGS) { uint32_t fl; - const char *start, *end; + const char *start; size_t sz; - const char nil = '\0'; if (SEC_SYNOPSIS != n->sec) return; @@ -595,15 +678,15 @@ pmdoc_Vt(MDOC_ARGS) if (0 == (sz = strlen(start))) return; - end = &start[sz - 1]; - while (end > start && ';' == *end) - end--; + if (';' == start[sz - 1]) + sz--; - if (end == start) + if (0 == sz) return; - dbt_appendb(key, ksz, start, end - start + 1); - dbt_appendb(key, ksz, &nil, 1); + dbt_appendb(key, ksz, start, sz); + dbt_appendb(key, ksz, "", 1); + fl = MANDOC_VARIABLE; memcpy(val->data, &fl, 4); } @@ -638,7 +721,6 @@ pmdoc_Nd(MDOC_ARGS) dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1); else dbt_append(rval, rsz, n->string); - first = 0; } } @@ -715,8 +797,8 @@ pmdoc_node(MDOC_ARGS) break; dbt_init(key, ksz); - (*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n); + (*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n); dbt_put(db, dbn, key, val); break; default: @@ -731,8 +813,7 @@ static int pman_node(MAN_ARGS) { const struct man_node *head, *body; - const char *start; - const char nil = '\0'; + const char *start, *sv; size_t sz; uint32_t fl; @@ -760,7 +841,8 @@ pman_node(MAN_ARGS) fl = MANDOC_NAME; memcpy(val->data, &fl, 4); - start = body->string; + assert(body->string); + start = sv = body->string; /* * Go through a special heuristic dance here. @@ -771,19 +853,21 @@ pman_node(MAN_ARGS) * the name parts here. */ - while (start) { + for ( ;; ) { 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_appendb(key, ksz, "", 1); dbt_put(db, dbn, key, val); - if (' ' == start[(int)sz]) + if (' ' == start[(int)sz]) { + start += (int)sz + 1; break; + } assert(',' == start[(int)sz]); start += (int)sz + 1; @@ -791,7 +875,24 @@ pman_node(MAN_ARGS) start++; } - return(1); + if (sv == start) { + dbt_init(key, ksz); + dbt_append(key, ksz, start); + return(1); + } + + while (' ' == *start) + start++; + + if ('\\' == *start && '-' == *(start + 1)) + start += 2; + else if ('-' == *start) + start++; + + while (' ' == *start) + start++; + + dbt_appendb(rval, rsz, start, strlen(start) + 1); } }