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/makewhatis.8 b/makewhatis.8
index beb2442f6a6e5169a0c6ed4774923d73a77f1cbd..02c4cc354bd63f13d18db636726b3651e7a03cf4 100644 (file)
--- a/makewhatis.8
+++ b/makewhatis.8
@@ -1,4 +1,4 @@
-.\"    $Id: makewhatis.8,v 1.1 2014/04/18 10:30:37 schwarze Exp $
+.\"    $Id: makewhatis.8,v 1.2 2014/04/25 12:13:15 schwarze Exp $

 .\"
 .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" 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.
 .\"
 .\" 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 18 2014 $
+.Dd $Mdocdate: April 25 2014 $

 .Dt MAKEWHATIS 8
 .Os
 .Sh NAME
 .Dt MAKEWHATIS 8
 .Os
 .Sh NAME


@@ -41,7 +41,7 @@
 .Fl u Ar dir
 .Op Ar
 .Nm
 .Fl u Ar dir
 .Op Ar
 .Nm

-.Op Fl Q
+.Op Fl DQ

 .Fl t Ar
 .Sh DESCRIPTION
 The
 .Fl t Ar
 .Sh DESCRIPTION
 The

diff --git a/mandocdb.c b/mandocdb.c
index 4e4c37c67e22d969fc895922b19a257bcb080a71..71a233da3d1ed0dba1f31db83559dcad17eea007 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.144 2014/04/23 21:06:41 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.145 2014/04/25 12:13:15 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1996,6 +1996,8 @@ dbadd(struct mpage *mpage, struct mchars *mc)
        mlink = mpage->mlinks;
 
        if (nodb) {
        mlink = mpage->mlinks;
 
        if (nodb) {

+               if (0 == debug)
+                       return;

                while (NULL != mlink) {
                        fputs(mlink->name, stdout);
                        if (NULL == mlink->next ||
                while (NULL != mlink) {
                        fputs(mlink->name, stdout);
                        if (NULL == mlink->next ||