version 1.13, 2011/04/28 10:44:02 |
version 1.16, 2011/05/03 10:08:09 |
Line 223 main(int argc, char *argv[]) |
|
Line 223 main(int argc, char *argv[]) |
|
struct man *man; /* resulting man */ |
struct man *man; /* resulting man */ |
char *fn; /* current file being parsed */ |
char *fn; /* current file being parsed */ |
const char *msec, /* manual section */ |
const char *msec, /* manual section */ |
|
*mtitle, /* manual title */ |
*dir; /* result dir (default: cwd) */ |
*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 */ |
Line 356 main(int argc, char *argv[]) |
|
Line 357 main(int argc, char *argv[]) |
|
msec = NULL != mdoc ? |
msec = NULL != mdoc ? |
mdoc_meta(mdoc)->msec : |
mdoc_meta(mdoc)->msec : |
man_meta(man)->msec; |
man_meta(man)->msec; |
|
mtitle = NULL != mdoc ? |
|
mdoc_meta(mdoc)->title : |
|
man_meta(man)->title; |
|
|
assert(msec); |
assert(msec); |
|
assert(mtitle); |
|
|
/* |
/* |
* The index record value consists of a nil-terminated |
* The index record value consists of a nil-terminated |
Line 370 main(int argc, char *argv[]) |
|
Line 375 main(int argc, char *argv[]) |
|
dbt_init(&rval, &rsz); |
dbt_init(&rval, &rsz); |
dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1); |
dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1); |
dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1); |
dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1); |
|
dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1); |
sv = rval.size; |
sv = rval.size; |
|
|
/* Fix the record number in the btree value. */ |
/* Fix the record number in the btree value. */ |
Line 453 dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz |
|
Line 459 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); |
} |
} |
|
|
|
#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); |
memcpy(key->data + (int)key->size, cp, sz); |
key->size += sz; |
key->size += sz; |
} |
} |
Line 485 pmdoc_Fd(MDOC_ARGS) |
|
Line 533 pmdoc_Fd(MDOC_ARGS) |
|
uint32_t fl; |
uint32_t fl; |
const char *start, *end; |
const char *start, *end; |
size_t sz; |
size_t sz; |
const char nil = '\0'; |
|
|
|
if (SEC_SYNOPSIS != n->sec) |
if (SEC_SYNOPSIS != n->sec) |
return; |
return; |
Line 519 pmdoc_Fd(MDOC_ARGS) |
|
Line 566 pmdoc_Fd(MDOC_ARGS) |
|
end--; |
end--; |
|
|
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); |
|
|
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; |
const char nil = '\0'; |
|
|
|
if (SEC_SYNOPSIS != n->sec) |
if (SEC_SYNOPSIS != n->sec) |
return; |
return; |
Line 613 pmdoc_Vt(MDOC_ARGS) |
|
Line 659 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; |
|
|
dbt_appendb(key, ksz, start, end - start + 1); |
dbt_appendb(key, ksz, start, sz); |
dbt_appendb(key, ksz, &nil, 1); |
dbt_appendb(key, ksz, "", 1); |
|
|
fl = MANDOC_VARIABLE; |
fl = MANDOC_VARIABLE; |
memcpy(val->data, &fl, 4); |
memcpy(val->data, &fl, 4); |
} |
} |
Line 656 pmdoc_Nd(MDOC_ARGS) |
|
Line 702 pmdoc_Nd(MDOC_ARGS) |
|
dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1); |
dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1); |
else |
else |
dbt_append(rval, rsz, n->string); |
dbt_append(rval, rsz, n->string); |
|
|
first = 0; |
first = 0; |
} |
} |
} |
} |
Line 733 pmdoc_node(MDOC_ARGS) |
|
Line 778 pmdoc_node(MDOC_ARGS) |
|
break; |
break; |
|
|
dbt_init(key, ksz); |
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); |
dbt_put(db, dbn, key, val); |
break; |
break; |
default: |
default: |
Line 750 pman_node(MAN_ARGS) |
|
Line 795 pman_node(MAN_ARGS) |
|
{ |
{ |
const struct man_node *head, *body; |
const struct man_node *head, *body; |
const char *start, *sv; |
const char *start, *sv; |
const char nil = '\0'; |
|
size_t sz; |
size_t sz; |
uint32_t fl; |
uint32_t fl; |
|
|
Line 797 pman_node(MAN_ARGS) |
|
Line 841 pman_node(MAN_ARGS) |
|
|
|
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); |
|
|