From 87fb027cd92fa277cc6404f10f66b97c9361e438 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 23 Mar 2014 12:44:56 +0000 Subject: If an .Nd block contains macros, avoid fragmented entries in mandocdb(8), instead use the .Nd content recursively. --- mdoc.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'mdoc.c') diff --git a/mdoc.c b/mdoc.c index 1d00b03c..4be40838 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.210 2014/03/23 12:11:18 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.211 2014/03/23 12:44:56 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -1020,3 +1021,42 @@ mdoc_isdelim(const char *p) return(DELIM_NONE); } + +void +mdoc_deroff(char **dest, const struct mdoc_node *n) +{ + char *cp; + size_t sz; + + if (MDOC_TEXT != n->type) { + for (n = n->child; n; n = n->next) + mdoc_deroff(dest, n); + return; + } + + /* Skip leading whitespace. */ + + for (cp = n->string; '\0' != *cp; cp++) + if (0 == isspace((unsigned char)*cp)) + break; + + /* Skip trailing whitespace. */ + + for (sz = strlen(cp); sz; sz--) + if (0 == isspace((unsigned char)cp[sz-1])) + break; + + /* Skip empty strings. */ + + if (0 == sz) + return; + + if (NULL == *dest) { + *dest = mandoc_strndup(cp, sz); + return; + } + + mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); + free(*dest); + *dest = cp; +} -- cgit v1.2.3-56-ge451