summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-04-12 14:48:42 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-04-12 14:48:42 +0000
commit7c8eae67dee599e46dea26124019169105fa75e1 (patch)
tree8300feabf05d86d02bf5391bcb1cf112c3e982dc
parent21c8260f4efe764565032644164a6d521e7edbcf (diff)
downloadmandoc-7c8eae67dee599e46dea26124019169105fa75e1.tar.gz
Let mandoc-db also collect -man descriptions.
-rw-r--r--mandoc-db.c30
1 files changed, 25 insertions, 5 deletions
diff --git a/mandoc-db.c b/mandoc-db.c
index cbde5bb8..c3ad4cc5 100644
--- a/mandoc-db.c
+++ b/mandoc-db.c
@@ -731,7 +731,7 @@ static int
pman_node(MAN_ARGS)
{
const struct man_node *head, *body;
- const char *start;
+ const char *start, *sv;
const char nil = '\0';
size_t sz;
uint32_t fl;
@@ -760,7 +760,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,7 +772,7 @@ pman_node(MAN_ARGS)
* the name parts here.
*/
- while (start) {
+ for ( ;; ) {
sz = strcspn(start, " ,");
if ('\0' == start[(int)sz])
break;
@@ -782,8 +783,10 @@ pman_node(MAN_ARGS)
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 +794,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);
}
}