From 82bb800220e99f4a7ed77fa40ad9d82cf32010bd Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Fri, 4 Apr 2014 02:31:07 +0000
Subject: When the -n or -t flag is given to makewhatis(8), write names and
 decriptions to stdout, in a format similar to apropos(1) output. Inspired by
 espie@'s makewhatis.

---
 mandocdb.c | 46 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 6 deletions(-)

(limited to 'mandocdb.c')

diff --git a/mandocdb.c b/mandocdb.c
index 5ce63bcb..a054ffc9 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.127 2014/04/03 21:45:31 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.128 2014/04/04 02:31:07 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1858,11 +1858,43 @@ dbadd(struct mpage *mpage, struct mchars *mc)
 	size_t		 i;
 	unsigned int	 slot;
 
-	if (debug)
-		say(mpage->mlinks->file, "Adding to database");
-
-	if (nodb)
+	mlink = mpage->mlinks;
+
+	if (nodb) {
+		while (NULL != mlink) {
+			fputs(mlink->name, stdout);
+			if (NULL == mlink->next ||
+			    strcmp(mlink->dsec, mlink->next->dsec) ||
+			    strcmp(mlink->fsec, mlink->next->fsec) ||
+			    strcmp(mlink->arch, mlink->next->arch)) {
+				putchar('(');
+				if ('\0' == *mlink->dsec)
+					fputs(mlink->fsec, stdout);
+				else
+					fputs(mlink->dsec, stdout);
+				if ('\0' != *mlink->arch)
+					printf("/%s", mlink->arch);
+				putchar(')');
+			}
+			mlink = mlink->next;
+			if (NULL != mlink)
+				fputs(", ", stdout);
+		}
+		for (key = ohash_first(&strings, &slot); NULL != key;
+		     key = ohash_next(&strings, &slot)) {
+			if (TYPE_Nd & key->mask) {
+				if (NULL == key->rendered)
+					render_key(mc, key);
+				printf(" - %s", key->rendered);
+				break;
+			}
+		}
+		putchar('\n');
 		return;
+	}
+
+	if (debug)
+		say(mlink->file, "Adding to database");
 
 	i = 1;
 	SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
@@ -1870,8 +1902,10 @@ dbadd(struct mpage *mpage, struct mchars *mc)
 	mpage->recno = sqlite3_last_insert_rowid(db);
 	sqlite3_reset(stmts[STMT_INSERT_PAGE]);
 
-	for (mlink = mpage->mlinks; mlink; mlink = mlink->next)
+	while (NULL != mlink) {
 		dbadd_mlink(mlink);
+		mlink = mlink->next;
+	}
 
 	for (key = ohash_first(&strings, &slot); NULL != key;
 	     key = ohash_next(&strings, &slot)) {
-- 
cgit v1.2.3-56-ge451