=================================================================== RCS file: /cvs/mandoc/Attic/mandoc-db.c,v retrieving revision 1.8 retrieving revision 1.14 diff -u -p -r1.8 -r1.14 --- mandoc/Attic/mandoc-db.c 2011/04/05 14:10:52 1.8 +++ mandoc/Attic/mandoc-db.c 2011/05/01 11:56:26 1.14 @@ -1,4 +1,4 @@ -/* $Id: mandoc-db.c,v 1.8 2011/04/05 14:10:52 kristaps Exp $ */ +/* $Id: mandoc-db.c,v 1.14 2011/05/01 11:56:26 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -48,18 +48,21 @@ enum type { MANDOC_FUNCTION, MANDOC_UTILITY, MANDOC_INCLUDES, - MANDOC_VARIABLE + MANDOC_VARIABLE, + MANDOC_STANDARD }; #define MAN_ARGS DB *db, \ const char *dbn, \ DBT *key, size_t *ksz, \ DBT *val, \ + DBT *rval, size_t *rsz, \ const struct man_node *n #define MDOC_ARGS DB *db, \ const char *dbn, \ DBT *key, size_t *ksz, \ DBT *val, \ + DBT *rval, size_t *rsz, \ const struct mdoc_node *n static void dbt_append(DBT *, size_t *, const char *); @@ -68,19 +71,19 @@ static void dbt_appendb(DBT *, size_t *, static void dbt_init(DBT *, size_t *); 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 void pman(DB *, const char *, DBT *, size_t *, + DBT *, DBT *, size_t *, struct man *); static int pman_node(MAN_ARGS); -static void pmdoc(DB *, const char *, - DBT *, size_t *, DBT *, - const char *, struct mdoc *); +static void pmdoc(DB *, const char *, DBT *, size_t *, + DBT *, DBT *, size_t *, struct mdoc *); static void pmdoc_node(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); @@ -119,13 +122,13 @@ static const pmdoc_nf mdocs[MDOC_MAX] = { NULL, /* Ic */ pmdoc_In, /* In */ NULL, /* Li */ - NULL, /* Nd */ + pmdoc_Nd, /* Nd */ pmdoc_Nm, /* Nm */ NULL, /* Op */ NULL, /* Ot */ NULL, /* Pa */ NULL, /* Rv */ - NULL, /* St */ + pmdoc_St, /* St */ pmdoc_Vt, /* Va */ pmdoc_Vt, /* Vt */ NULL, /* Xr */ @@ -218,21 +221,23 @@ 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 *fn; /* current file being parsed */ + const char *msec, /* manual section */ + *dir; /* result dir (default: cwd) */ char ibuf[MAXPATHLEN], /* index fname */ ibbuf[MAXPATHLEN], /* index backup fname */ fbuf[MAXPATHLEN], /* btree fname */ fbbuf[MAXPATHLEN]; /* btree backup fname */ - int c; - DB *index, /* index database */ + int ch; + DB *idx, /* index database */ *db; /* keyword database */ DBT rkey, rval, /* recno entries */ key, val; /* persistent keyword entries */ - size_t ksz; /* entry buffer size */ - char vbuf[8]; + size_t sv, + ksz, rsz; /* entry buffer size */ + char vbuf[8]; /* stringified record number */ BTREEINFO info; /* btree configuration */ - recno_t rec; + recno_t rec; /* current record number */ extern int optind; extern char *optarg; @@ -244,8 +249,8 @@ main(int argc, char *argv[]) dir = ""; - while (-1 != (c = getopt(argc, argv, "d:"))) - switch (c) { + while (-1 != (ch = getopt(argc, argv, "d:"))) + switch (ch) { case ('d'): dir = optarg; break; @@ -304,7 +309,7 @@ main(int argc, char *argv[]) exit((int)MANDOCLEVEL_SYSERR); } - index = dbopen(ibbuf, MANDOC_FLAGS, 0644, DB_RECNO, NULL); + idx = dbopen(ibbuf, MANDOC_FLAGS, 0644, DB_RECNO, NULL); if (NULL == db) { perror(ibbuf); @@ -331,45 +336,76 @@ main(int argc, char *argv[]) rkey.size = sizeof(recno_t); rec = 1; - ksz = 0; + ksz = rsz = 0; while (NULL != (fn = *argv++)) { mparse_reset(mp); + /* Parse and get (non-empty) AST. */ + if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) { fprintf(stderr, "%s: Parse failure\n", fn); continue; } - mparse_result(mp, &mdoc, &man); if (NULL == mdoc && NULL == man) continue; - rkey.data = &rec; - rval.data = fn; - rval.size = strlen(fn) + 1; + /* Manual section: can be empty string. */ - if (-1 == (*index->put)(index, &rkey, &rval, 0)) { - perror(ibbuf); - break; - } + msec = NULL != mdoc ? + mdoc_meta(mdoc)->msec : + man_meta(man)->msec; + assert(msec); + + /* + * The index record value consists of a nil-terminated + * filename, a nil-terminated manual section, and a + * nil-terminated description. Since the description + * may not be set, we set a sentinel to see if we're + * going to write a nil byte in its place. + */ + + dbt_init(&rval, &rsz); + dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1); + dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1); + sv = rval.size; + + /* Fix the record number in the btree value. */ + memset(val.data, 0, sizeof(uint32_t)); memcpy(val.data + 4, &rec, sizeof(uint32_t)); if (mdoc) - pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc); + pmdoc(db, fbbuf, &key, &ksz, + &val, &rval, &rsz, mdoc); else - pman(db, fbbuf, &key, &ksz, &val, fn, man); + pman(db, fbbuf, &key, &ksz, + &val, &rval, &rsz, man); + + /* + * Apply this to the index. If we haven't had a + * description set, put an empty one in now. + */ + + if (rval.size == sv) + dbt_appendb(&rval, &rsz, "", 1); + + rkey.data = &rec; + dbt_put(idx, ibbuf, &rkey, &rval); + + printf("Indexed: %s\n", fn); rec++; } (*db->close)(db); - (*index->close)(index); + (*idx->close)(idx); mparse_free(mp); free(key.data); + free(rval.data); /* Atomically replace the file with our temporary one. */ @@ -407,6 +443,9 @@ dbt_init(DBT *key, size_t *ksz) static void dbt_appendb(DBT *key, size_t *ksz, const void *cp, size_t sz) { + void *dstp, *endp; + int ssz; + enum mandoc_esc esc; assert(key->data); @@ -417,7 +456,47 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz key->data = mandoc_realloc(key->data, *ksz); } - memcpy(key->data + (int)key->size, cp, sz); + 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; + } + + memcpy(dstp, cp, sz); key->size += sz; } @@ -449,7 +528,6 @@ pmdoc_Fd(MDOC_ARGS) uint32_t fl; const char *start, *end; size_t sz; - char nil; if (SEC_SYNOPSIS != n->sec) return; @@ -482,9 +560,8 @@ pmdoc_Fd(MDOC_ARGS) if ('>' == *end || '"' == *end) end--; - nil = '\0'; 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); @@ -536,12 +613,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; - char nil; if (SEC_SYNOPSIS != n->sec) return; @@ -562,16 +654,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; - nil = '\0'; - 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); } @@ -592,8 +683,26 @@ pmdoc_Fo(MDOC_ARGS) memcpy(val->data, &fl, 4); } + /* ARGSUSED */ static void +pmdoc_Nd(MDOC_ARGS) +{ + int first; + + for (first = 1, n = n->child; n; n = n->next) { + if (MDOC_TEXT != n->type) + continue; + if (first) + dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1); + else + dbt_append(rval, rsz, n->string); + first = 0; + } +} + +/* ARGSUSED */ +static void pmdoc_Nm(MDOC_ARGS) { uint32_t fl; @@ -628,7 +737,7 @@ dbt_put(DB *db, const char *dbn, DBT *key, DBT *val) return; assert(key->data); - assert(8 == val->size); + assert(val->size); assert(val->data); if (0 == (*db->put)(db, key, val, 0)) @@ -664,24 +773,23 @@ pmdoc_node(MDOC_ARGS) break; dbt_init(key, ksz); - (*mdocs[n->tok])(db, dbn, key, ksz, val, n); + (*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n); dbt_put(db, dbn, key, val); break; default: break; } - pmdoc_node(db, dbn, key, ksz, val, n->child); - pmdoc_node(db, dbn, key, ksz, val, n->next); + pmdoc_node(db, dbn, key, ksz, val, rval, rsz, n->child); + pmdoc_node(db, dbn, key, ksz, val, rval, rsz, n->next); } static int pman_node(MAN_ARGS) { const struct man_node *head, *body; - const char *start; - char nil; + const char *start, *sv; size_t sz; uint32_t fl; @@ -705,12 +813,12 @@ pman_node(MAN_ARGS) 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; + assert(body->string); + start = sv = body->string; /* * Go through a special heuristic dance here. @@ -721,19 +829,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; @@ -741,35 +851,50 @@ 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); } } - if (pman_node(db, dbn, key, ksz, val, n->child)) + if (pman_node(db, dbn, key, ksz, val, rval, rsz, n->child)) return(1); - if (pman_node(db, dbn, key, ksz, val, n->next)) + if (pman_node(db, dbn, key, ksz, val, rval, rsz, n->next)) return(1); return(0); } static void -pman(DB *db, const char *dbn, - DBT *key, size_t *ksz, DBT *val, - const char *path, struct man *m) +pman(DB *db, const char *dbn, DBT *key, size_t *ksz, + DBT *val, DBT *rval, size_t *rsz, struct man *m) { - pman_node(db, dbn, key, ksz, val, man_node(m)); + pman_node(db, dbn, key, ksz, val, rval, rsz, man_node(m)); } static void -pmdoc(DB *db, const char *dbn, - DBT *key, size_t *ksz, DBT *val, - const char *path, struct mdoc *m) +pmdoc(DB *db, const char *dbn, DBT *key, size_t *ksz, + DBT *val, DBT *rval, size_t *rsz, struct mdoc *m) { - pmdoc_node(db, dbn, key, ksz, val, mdoc_node(m)); + pmdoc_node(db, dbn, key, ksz, val, rval, rsz, mdoc_node(m)); } static void