version 1.13, 2011/04/28 10:44:02 |
version 1.14, 2011/05/01 11:56:26 |
Line 443 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 453 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 485 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; |
const char nil = '\0'; |
|
|
|
if (SEC_SYNOPSIS != n->sec) |
if (SEC_SYNOPSIS != n->sec) |
return; |
return; |
Line 519 pmdoc_Fd(MDOC_ARGS) |
|
Line 561 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 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; |
|
|
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 697 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 773 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 790 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 836 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); |
|
|