summaryrefslogtreecommitdiffstats
path: root/mdoc_term.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-06-27 12:20:18 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-06-27 12:20:18 +0000
commit1bd25a143cc0c80e32fa939ecbe1d27ea3e4a03d (patch)
tree583c54441369b860b95bf7d7670a068132f539f7 /mdoc_term.c
parent818668a067fce10e78f5f5098bed05373f3338cf (diff)
downloadmandoc-1bd25a143cc0c80e32fa939ecbe1d27ea3e4a03d.tar.gz
Improve "man -h" output.
1. For pages lacking a SYNOPSIS, show the NAME section rather than nothing. 2. Do not print a stray blank before the beginning of a SYNOPSIS. Both issues reported by, and patch OK'ed by, tb@.
Diffstat (limited to 'mdoc_term.c')
-rw-r--r--mdoc_term.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/mdoc_term.c b/mdoc_term.c
index 9abdcfa0..44de128b 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -253,7 +253,7 @@ static int fn_prio;
void
terminal_mdoc(void *arg, const struct roff_meta *mdoc)
{
- struct roff_node *n;
+ struct roff_node *n, *nn;
struct termp *p;
size_t save_defindent;
@@ -265,16 +265,20 @@ terminal_mdoc(void *arg, const struct roff_meta *mdoc)
n = mdoc->first->child;
if (p->synopsisonly) {
- while (n != NULL) {
- if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
- if (n->child->next->child != NULL)
- print_mdoc_nodelist(p, NULL,
- mdoc, n->child->next->child);
- term_newln(p);
+ for (nn = NULL; n != NULL; n = n->next) {
+ if (n->tok != MDOC_Sh)
+ continue;
+ if (n->sec == SEC_SYNOPSIS)
break;
- }
- n = n->next;
+ if (nn == NULL && n->sec == SEC_NAME)
+ nn = n;
}
+ if (n == NULL)
+ n = nn;
+ p->flags |= TERMP_NOSPACE;
+ if (n != NULL && (n = n->child->next->child) != NULL)
+ print_mdoc_nodelist(p, NULL, mdoc, n);
+ term_newln(p);
} else {
save_defindent = p->defindent;
if (p->defindent == 0)