version 1.9, 2011/04/05 14:16:05 |
version 1.14, 2011/05/01 11:56:26 |
|
|
MANDOC_FUNCTION, |
MANDOC_FUNCTION, |
MANDOC_UTILITY, |
MANDOC_UTILITY, |
MANDOC_INCLUDES, |
MANDOC_INCLUDES, |
MANDOC_VARIABLE |
MANDOC_VARIABLE, |
|
MANDOC_STANDARD |
}; |
}; |
|
|
#define MAN_ARGS DB *db, \ |
#define MAN_ARGS DB *db, \ |
const char *dbn, \ |
const char *dbn, \ |
DBT *key, size_t *ksz, \ |
DBT *key, size_t *ksz, \ |
DBT *val, \ |
DBT *val, \ |
|
DBT *rval, size_t *rsz, \ |
const struct man_node *n |
const struct man_node *n |
#define MDOC_ARGS DB *db, \ |
#define MDOC_ARGS DB *db, \ |
const char *dbn, \ |
const char *dbn, \ |
DBT *key, size_t *ksz, \ |
DBT *key, size_t *ksz, \ |
DBT *val, \ |
DBT *val, \ |
|
DBT *rval, size_t *rsz, \ |
const struct mdoc_node *n |
const struct mdoc_node *n |
|
|
static void dbt_append(DBT *, size_t *, const char *); |
static void dbt_append(DBT *, size_t *, const char *); |
Line 68 static void dbt_appendb(DBT *, size_t *, |
|
Line 71 static void dbt_appendb(DBT *, size_t *, |
|
static void dbt_init(DBT *, size_t *); |
static void dbt_init(DBT *, size_t *); |
static void dbt_put(DB *, const char *, DBT *, DBT *); |
static void dbt_put(DB *, const char *, DBT *, DBT *); |
static void usage(void); |
static void usage(void); |
static void pman(DB *, const char *, DBT *, |
static void pman(DB *, const char *, DBT *, size_t *, |
size_t *, DBT *, struct man *); |
DBT *, DBT *, size_t *, struct man *); |
static int pman_node(MAN_ARGS); |
static int pman_node(MAN_ARGS); |
static void pmdoc(DB *, const char *, DBT *, |
static void pmdoc(DB *, const char *, DBT *, size_t *, |
size_t *, DBT *, struct mdoc *); |
DBT *, DBT *, size_t *, struct mdoc *); |
static void pmdoc_node(MDOC_ARGS); |
static void pmdoc_node(MDOC_ARGS); |
static void pmdoc_Fd(MDOC_ARGS); |
static void pmdoc_Fd(MDOC_ARGS); |
static void pmdoc_In(MDOC_ARGS); |
static void pmdoc_In(MDOC_ARGS); |
static void pmdoc_Fn(MDOC_ARGS); |
static void pmdoc_Fn(MDOC_ARGS); |
static void pmdoc_Fo(MDOC_ARGS); |
static void pmdoc_Fo(MDOC_ARGS); |
|
static void pmdoc_Nd(MDOC_ARGS); |
static void pmdoc_Nm(MDOC_ARGS); |
static void pmdoc_Nm(MDOC_ARGS); |
|
static void pmdoc_St(MDOC_ARGS); |
static void pmdoc_Vt(MDOC_ARGS); |
static void pmdoc_Vt(MDOC_ARGS); |
|
|
typedef void (*pmdoc_nf)(MDOC_ARGS); |
typedef void (*pmdoc_nf)(MDOC_ARGS); |
Line 117 static const pmdoc_nf mdocs[MDOC_MAX] = { |
|
Line 122 static const pmdoc_nf mdocs[MDOC_MAX] = { |
|
NULL, /* Ic */ |
NULL, /* Ic */ |
pmdoc_In, /* In */ |
pmdoc_In, /* In */ |
NULL, /* Li */ |
NULL, /* Li */ |
NULL, /* Nd */ |
pmdoc_Nd, /* Nd */ |
pmdoc_Nm, /* Nm */ |
pmdoc_Nm, /* Nm */ |
NULL, /* Op */ |
NULL, /* Op */ |
NULL, /* Ot */ |
NULL, /* Ot */ |
NULL, /* Pa */ |
NULL, /* Pa */ |
NULL, /* Rv */ |
NULL, /* Rv */ |
NULL, /* St */ |
pmdoc_St, /* St */ |
pmdoc_Vt, /* Va */ |
pmdoc_Vt, /* Va */ |
pmdoc_Vt, /* Vt */ |
pmdoc_Vt, /* Vt */ |
NULL, /* Xr */ |
NULL, /* Xr */ |
Line 216 main(int argc, char *argv[]) |
|
Line 221 main(int argc, char *argv[]) |
|
struct mparse *mp; /* parse sequence */ |
struct mparse *mp; /* parse sequence */ |
struct mdoc *mdoc; /* resulting mdoc */ |
struct mdoc *mdoc; /* resulting mdoc */ |
struct man *man; /* resulting man */ |
struct man *man; /* resulting man */ |
char *fn; |
char *fn; /* current file being parsed */ |
const char *dir; /* result dir (default: cwd) */ |
const char *msec, /* manual section */ |
|
*dir; /* result dir (default: cwd) */ |
char ibuf[MAXPATHLEN], /* index fname */ |
char ibuf[MAXPATHLEN], /* index fname */ |
ibbuf[MAXPATHLEN], /* index backup fname */ |
ibbuf[MAXPATHLEN], /* index backup fname */ |
fbuf[MAXPATHLEN], /* btree fname */ |
fbuf[MAXPATHLEN], /* btree fname */ |
fbbuf[MAXPATHLEN]; /* btree backup fname */ |
fbbuf[MAXPATHLEN]; /* btree backup fname */ |
int c; |
int ch; |
DB *idx, /* index database */ |
DB *idx, /* index database */ |
*db; /* keyword database */ |
*db; /* keyword database */ |
DBT rkey, rval, /* recno entries */ |
DBT rkey, rval, /* recno entries */ |
key, val; /* persistent keyword entries */ |
key, val; /* persistent keyword entries */ |
size_t ksz; /* entry buffer size */ |
size_t sv, |
char vbuf[8]; |
ksz, rsz; /* entry buffer size */ |
|
char vbuf[8]; /* stringified record number */ |
BTREEINFO info; /* btree configuration */ |
BTREEINFO info; /* btree configuration */ |
recno_t rec; |
recno_t rec; /* current record number */ |
extern int optind; |
extern int optind; |
extern char *optarg; |
extern char *optarg; |
|
|
Line 242 main(int argc, char *argv[]) |
|
Line 249 main(int argc, char *argv[]) |
|
|
|
dir = ""; |
dir = ""; |
|
|
while (-1 != (c = getopt(argc, argv, "d:"))) |
while (-1 != (ch = getopt(argc, argv, "d:"))) |
switch (c) { |
switch (ch) { |
case ('d'): |
case ('d'): |
dir = optarg; |
dir = optarg; |
break; |
break; |
Line 329 main(int argc, char *argv[]) |
|
Line 336 main(int argc, char *argv[]) |
|
rkey.size = sizeof(recno_t); |
rkey.size = sizeof(recno_t); |
|
|
rec = 1; |
rec = 1; |
ksz = 0; |
ksz = rsz = 0; |
|
|
while (NULL != (fn = *argv++)) { |
while (NULL != (fn = *argv++)) { |
mparse_reset(mp); |
mparse_reset(mp); |
|
|
|
/* Parse and get (non-empty) AST. */ |
|
|
if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) { |
if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) { |
fprintf(stderr, "%s: Parse failure\n", fn); |
fprintf(stderr, "%s: Parse failure\n", fn); |
continue; |
continue; |
} |
} |
|
|
mparse_result(mp, &mdoc, &man); |
mparse_result(mp, &mdoc, &man); |
if (NULL == mdoc && NULL == man) |
if (NULL == mdoc && NULL == man) |
continue; |
continue; |
|
|
rkey.data = &rec; |
/* Manual section: can be empty string. */ |
rval.data = fn; |
|
rval.size = strlen(fn) + 1; |
|
|
|
if (-1 == (*idx->put)(idx, &rkey, &rval, 0)) { |
msec = NULL != mdoc ? |
perror(ibbuf); |
mdoc_meta(mdoc)->msec : |
break; |
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)); |
memset(val.data, 0, sizeof(uint32_t)); |
memcpy(val.data + 4, &rec, sizeof(uint32_t)); |
memcpy(val.data + 4, &rec, sizeof(uint32_t)); |
|
|
if (mdoc) |
if (mdoc) |
pmdoc(db, fbbuf, &key, &ksz, &val, mdoc); |
pmdoc(db, fbbuf, &key, &ksz, |
|
&val, &rval, &rsz, mdoc); |
else |
else |
pman(db, fbbuf, &key, &ksz, &val, 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++; |
rec++; |
} |
} |
|
|
Line 368 main(int argc, char *argv[]) |
|
Line 405 main(int argc, char *argv[]) |
|
mparse_free(mp); |
mparse_free(mp); |
|
|
free(key.data); |
free(key.data); |
|
free(rval.data); |
|
|
/* Atomically replace the file with our temporary one. */ |
/* Atomically replace the file with our temporary one. */ |
|
|
Line 405 dbt_init(DBT *key, size_t *ksz) |
|
Line 443 dbt_init(DBT *key, size_t *ksz) |
|
static void |
static void |
dbt_appendb(DBT *key, size_t *ksz, const void *cp, size_t sz) |
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); |
assert(key->data); |
|
|
Line 415 dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz |
|
Line 456 dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz |
|
key->data = mandoc_realloc(key->data, *ksz); |
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; |
key->size += sz; |
} |
} |
|
|
Line 447 pmdoc_Fd(MDOC_ARGS) |
|
Line 528 pmdoc_Fd(MDOC_ARGS) |
|
uint32_t fl; |
uint32_t fl; |
const char *start, *end; |
const char *start, *end; |
size_t sz; |
size_t sz; |
char nil; |
|
|
|
if (SEC_SYNOPSIS != n->sec) |
if (SEC_SYNOPSIS != n->sec) |
return; |
return; |
Line 480 pmdoc_Fd(MDOC_ARGS) |
|
Line 560 pmdoc_Fd(MDOC_ARGS) |
|
if ('>' == *end || '"' == *end) |
if ('>' == *end || '"' == *end) |
end--; |
end--; |
|
|
nil = '\0'; |
|
dbt_appendb(key, ksz, start, end - start + 1); |
dbt_appendb(key, ksz, start, end - start + 1); |
dbt_appendb(key, ksz, &nil, 1); |
dbt_appendb(key, ksz, "", 1); |
|
|
fl = MANDOC_INCLUDES; |
fl = MANDOC_INCLUDES; |
memcpy(val->data, &fl, 4); |
memcpy(val->data, &fl, 4); |
Line 534 pmdoc_Fn(MDOC_ARGS) |
|
Line 613 pmdoc_Fn(MDOC_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
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) |
pmdoc_Vt(MDOC_ARGS) |
{ |
{ |
uint32_t fl; |
uint32_t fl; |
const char *start, *end; |
const char *start; |
size_t sz; |
size_t sz; |
char nil; |
|
|
|
if (SEC_SYNOPSIS != n->sec) |
if (SEC_SYNOPSIS != n->sec) |
return; |
return; |
Line 560 pmdoc_Vt(MDOC_ARGS) |
|
Line 654 pmdoc_Vt(MDOC_ARGS) |
|
if (0 == (sz = strlen(start))) |
if (0 == (sz = strlen(start))) |
return; |
return; |
|
|
end = &start[sz - 1]; |
if (';' == start[sz - 1]) |
while (end > start && ';' == *end) |
sz--; |
end--; |
|
|
|
if (end == start) |
if (0 == sz) |
return; |
return; |
|
|
nil = '\0'; |
dbt_appendb(key, ksz, start, sz); |
dbt_appendb(key, ksz, start, end - start + 1); |
dbt_appendb(key, ksz, "", 1); |
dbt_appendb(key, ksz, &nil, 1); |
|
fl = MANDOC_VARIABLE; |
fl = MANDOC_VARIABLE; |
memcpy(val->data, &fl, 4); |
memcpy(val->data, &fl, 4); |
} |
} |
Line 590 pmdoc_Fo(MDOC_ARGS) |
|
Line 683 pmdoc_Fo(MDOC_ARGS) |
|
memcpy(val->data, &fl, 4); |
memcpy(val->data, &fl, 4); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
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) |
pmdoc_Nm(MDOC_ARGS) |
{ |
{ |
uint32_t fl; |
uint32_t fl; |
Line 626 dbt_put(DB *db, const char *dbn, DBT *key, DBT *val) |
|
Line 737 dbt_put(DB *db, const char *dbn, DBT *key, DBT *val) |
|
return; |
return; |
|
|
assert(key->data); |
assert(key->data); |
assert(8 == val->size); |
assert(val->size); |
assert(val->data); |
assert(val->data); |
|
|
if (0 == (*db->put)(db, key, val, 0)) |
if (0 == (*db->put)(db, key, val, 0)) |
Line 662 pmdoc_node(MDOC_ARGS) |
|
Line 773 pmdoc_node(MDOC_ARGS) |
|
break; |
break; |
|
|
dbt_init(key, ksz); |
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); |
dbt_put(db, dbn, key, val); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
pmdoc_node(db, dbn, key, ksz, val, n->child); |
pmdoc_node(db, dbn, key, ksz, val, rval, rsz, n->child); |
pmdoc_node(db, dbn, key, ksz, val, n->next); |
pmdoc_node(db, dbn, key, ksz, val, rval, rsz, n->next); |
} |
} |
|
|
static int |
static int |
pman_node(MAN_ARGS) |
pman_node(MAN_ARGS) |
{ |
{ |
const struct man_node *head, *body; |
const struct man_node *head, *body; |
const char *start; |
const char *start, *sv; |
char nil; |
|
size_t sz; |
size_t sz; |
uint32_t fl; |
uint32_t fl; |
|
|
Line 703 pman_node(MAN_ARGS) |
|
Line 813 pman_node(MAN_ARGS) |
|
0 == strcmp(head->string, "NAME") && |
0 == strcmp(head->string, "NAME") && |
NULL != (body = body->child) && |
NULL != (body = body->child) && |
MAN_TEXT == body->type) { |
MAN_TEXT == body->type) { |
nil = '\0'; |
|
|
|
fl = MANDOC_NAME; |
fl = MANDOC_NAME; |
memcpy(val->data, &fl, 4); |
memcpy(val->data, &fl, 4); |
|
|
start = body->string; |
assert(body->string); |
|
start = sv = body->string; |
|
|
/* |
/* |
* Go through a special heuristic dance here. |
* Go through a special heuristic dance here. |
Line 719 pman_node(MAN_ARGS) |
|
Line 829 pman_node(MAN_ARGS) |
|
* the name parts here. |
* the name parts here. |
*/ |
*/ |
|
|
while (start) { |
for ( ;; ) { |
sz = strcspn(start, " ,"); |
sz = strcspn(start, " ,"); |
if ('\0' == start[(int)sz]) |
if ('\0' == start[(int)sz]) |
break; |
break; |
|
|
dbt_init(key, ksz); |
dbt_init(key, ksz); |
dbt_appendb(key, ksz, start, sz); |
dbt_appendb(key, ksz, start, sz); |
dbt_appendb(key, ksz, &nil, 1); |
dbt_appendb(key, ksz, "", 1); |
|
|
dbt_put(db, dbn, key, val); |
dbt_put(db, dbn, key, val); |
|
|
if (' ' == start[(int)sz]) |
if (' ' == start[(int)sz]) { |
|
start += (int)sz + 1; |
break; |
break; |
|
} |
|
|
assert(',' == start[(int)sz]); |
assert(',' == start[(int)sz]); |
start += (int)sz + 1; |
start += (int)sz + 1; |
Line 739 pman_node(MAN_ARGS) |
|
Line 851 pman_node(MAN_ARGS) |
|
start++; |
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); |
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(1); |
|
|
return(0); |
return(0); |
} |
} |
|
|
static void |
static void |
pman(DB *db, const char *dbn, DBT *key, |
pman(DB *db, const char *dbn, DBT *key, size_t *ksz, |
size_t *ksz, DBT *val, struct man *m) |
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 |
static void |
pmdoc(DB *db, const char *dbn, DBT *key, |
pmdoc(DB *db, const char *dbn, DBT *key, size_t *ksz, |
size_t *ksz, DBT *val, struct mdoc *m) |
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 |
static void |