From f9d5375f4ccd0f247e411f6362150e234e2fed71 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 23 Mar 2014 12:37:58 +0000 Subject: backport man(7) .Nd improvement --- mandocdb.c | 55 +++++++++---------------------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/mandocdb.c b/mandocdb.c index ae30855f..05ab11cf 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.49.2.14 2014/03/23 12:04:54 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.49.2.15 2014/03/23 12:37:58 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012 Ingo Schwarze @@ -1383,8 +1383,8 @@ static int pman_node(MAN_ARGS) { const struct man_node *head, *body; - char *start, *sv, *title; - size_t sz, titlesz; + char *start, *title; + size_t sz; if (NULL == n) return(0); @@ -1404,57 +1404,19 @@ pman_node(MAN_ARGS) NULL != (head = (head->child)) && MAN_TEXT == head->type && 0 == strcmp(head->string, "NAME") && - NULL != (body = body->child) && - MAN_TEXT == body->type) { + NULL != body->child) { - title = NULL; - titlesz = 0; /* * Suck the entire NAME section into memory. * Yes, we might run away. * But too many manuals have big, spread-out * NAME sections over many lines. */ - for ( ; NULL != body; body = body->next) { - if (MAN_TEXT != body->type) - break; - if (0 == (sz = strlen(body->string))) - continue; - title = mandoc_realloc - (title, titlesz + sz + 1); - memcpy(title + titlesz, body->string, sz); - titlesz += sz + 1; - title[(int)titlesz - 1] = ' '; - } - if (NULL == title) - return(0); - - title = mandoc_realloc(title, titlesz + 1); - title[(int)titlesz] = '\0'; - - /* Skip leading space. */ - sv = title; - while (isspace((unsigned char)*sv)) - sv++; - - if (0 == (sz = strlen(sv))) { - free(title); - return(0); - } - - /* Erase trailing space. */ - - start = &sv[sz - 1]; - while (start > sv && isspace((unsigned char)*start)) - *start-- = '\0'; - - if (start == sv) { - free(title); + title = NULL; + man_deroff(&title, body); + if (NULL == title) return(0); - } - - start = sv; /* * Go through a special heuristic dance here. @@ -1466,6 +1428,7 @@ pman_node(MAN_ARGS) * the name parts here. */ + start = title; for ( ;; ) { sz = strcspn(start, " ,"); if ('\0' == start[(int)sz]) @@ -1490,7 +1453,7 @@ pman_node(MAN_ARGS) buf->len = 0; - if (sv == start) { + if (start == title) { buf_append(buf, start); free(title); return(1); -- cgit v1.2.3-56-ge451