From: schwarze <schwarze@openbsd.org>
Date: Fri, 25 Apr 2014 12:12:35 +0000 (+0000)
Subject: Reduce the verbosity of makewhatis -t:
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dbb14b0b48b3a4d09d9387ac8a0a19532a80e33f;p=openbsd

Reduce the verbosity of makewhatis -t:
In the past, it always showed the title lines of the files processed.
Now, it only shows them when called with -D.
That is better because pkg_create calls makewhatis -t.
It is also more consistent with -D behaviour in non- -t modes.
Issue reported by ajacoutot@; ok espie@ ajacoutot@ jasper@.
---

diff --git a/usr.bin/mandoc/makewhatis.8 b/usr.bin/mandoc/makewhatis.8
index 72729cc2a4a..fafe9c9c853 100644
--- a/usr.bin/mandoc/makewhatis.8
+++ b/usr.bin/mandoc/makewhatis.8
@@ -1,4 +1,4 @@
-.\"	$Id: makewhatis.8,v 1.9 2014/04/04 02:31:01 schwarze Exp $
+.\"	$Id: makewhatis.8,v 1.10 2014/04/25 12:12:35 schwarze Exp $
 .\"
 .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 4 2014 $
+.Dd $Mdocdate: April 25 2014 $
 .Dt MAKEWHATIS 8
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Fl u Ar dir
 .Op Ar
 .Nm
-.Op Fl Q
+.Op Fl DQ
 .Fl t Ar
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c
index 3da7cae4c25..0c59b862ab3 100644
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.101 2014/04/23 21:06:33 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.102 2014/04/25 12:12:35 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1988,6 +1988,8 @@ dbadd(struct mpage *mpage, struct mchars *mc)
 	mlink = mpage->mlinks;
 
 	if (nodb) {
+		if (0 == debug)
+			return;
 		while (NULL != mlink) {
 			fputs(mlink->name, stdout);
 			if (NULL == mlink->next ||