From 893966b72e56377b567f265988a4d70023e16b1c Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 27 Jan 2017 14:32:54 +0000 Subject: merge rev 1.242: warn about missing one-line description --- mandocdb.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mandocdb.c b/mandocdb.c index a7bc4cd1..964f23c6 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.220.2.10 2017/01/27 14:23:13 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.220.2.11 2017/01/27 14:32:54 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011-2017 Ingo Schwarze @@ -1270,6 +1270,12 @@ mpages_merge(struct mparse *mp) parse_mdoc(mpage, &man->meta, man->first); else parse_man(mpage, &man->meta, man->first); + if (mpage->desc == NULL) { + mpage->desc = mandoc_strdup(mlink->name); + if (warnings) + say(mlink->file, "No one-line description, " + "using filename \"%s\"", mlink->name); + } putkey(mpage, mpage->sec, TYPE_sec); if (*mpage->arch != '\0') @@ -1285,9 +1291,6 @@ mpages_merge(struct mparse *mp) putkey(mpage, mlink->name, NAME_FILE); } - if (mpage->desc == NULL) - mpage->desc = mandoc_strdup(mpage->mlinks->name); - if (warnings && !use_all) for (mlink = mpage->mlinks; mlink; mlink = mlink->next) @@ -1449,7 +1452,8 @@ parse_cat(struct mpage *mpage, int fd) /* Skip to next word. */ ; } else { if (warnings) - say(mlink->file, "No dash in title line"); + say(mlink->file, "No dash in title line, " + "reusing \"%s\" as one-line description", title); p = title; } -- cgit v1.2.3