===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.125
retrieving revision 1.129
diff -u -p -r1.125 -r1.129
--- mandoc/mandocdb.c	2014/04/03 15:37:19	1.125
+++ mandoc/mandocdb.c	2014/04/04 15:55:19	1.129
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.125 2014/04/03 15:37:19 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.129 2014/04/04 15:55:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -224,7 +224,7 @@ static	const struct mdoc_handler mdocs[MDOC_MAX] = {
 	{ NULL, TYPE_In },  /* In */
 	{ NULL, TYPE_Li },  /* Li */
 	{ parse_mdoc_Nd, TYPE_Nd },  /* Nd */
-	{ parse_mdoc_Nm, TYPE_Nm },  /* Nm */
+	{ parse_mdoc_Nm, 0 },  /* Nm */
 	{ NULL, 0 },  /* Op */
 	{ NULL, 0 },  /* Ot */
 	{ NULL, TYPE_Pa },  /* Pa */
@@ -357,7 +357,7 @@ main(int argc, char *argv[])
 	path_arg = NULL;
 	op = OP_DEFAULT;
 
-	while (-1 != (ch = getopt(argc, argv, "aC:Dd:nQT:tu:W")))
+	while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v")))
 		switch (ch) {
 		case ('a'):
 			use_all = 1;
@@ -378,6 +378,9 @@ main(int argc, char *argv[])
 		case ('n'):
 			nodb = 1;
 			break;
+		case ('p'):
+			warnings = 1;
+			break;
 		case ('Q'):
 			mparse_options |= MPARSE_QUICK;
 			break;
@@ -400,8 +403,8 @@ main(int argc, char *argv[])
 			path_arg = optarg;
 			op = OP_DELETE;
 			break;
-		case ('W'):
-			warnings = 1;
+		case ('v'):
+			/* Compatibility with espie@'s makewhatis. */
 			break;
 		default:
 			goto usage;
@@ -459,6 +462,11 @@ main(int argc, char *argv[])
 		} else
 			manpath_parse(&dirs, path_arg, NULL, NULL);
 
+		if (0 == dirs.sz) {
+			exitcode = (int)MANDOCLEVEL_BADARG;
+			say("", "Empty manpath");
+		}
+
 		/*
 		 * First scan the tree rooted at a base directory, then
 		 * build a new database and finally move it into place.
@@ -506,10 +514,10 @@ out:
 	ohash_delete(&mlinks);
 	return(exitcode);
 usage:
-	fprintf(stderr, "usage: %s [-aDnQW] [-C file] [-Tutf8]\n"
-			"       %s [-aDnQW] [-Tutf8] dir ...\n"
-			"       %s [-DnQW] [-Tutf8] -d dir [file ...]\n"
-			"       %s [-DnW] -u dir [file ...]\n"
+	fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n"
+			"       %s [-aDnpQ] [-Tutf8] dir ...\n"
+			"       %s [-DnpQ] [-Tutf8] -d dir [file ...]\n"
+			"       %s [-Dnp] -u dir [file ...]\n"
 			"       %s [-Q] -t file ...\n",
 		       progname, progname, progname, 
 		       progname, progname);
@@ -1389,7 +1397,7 @@ parse_man(struct mpage *mpage, const struct man_node *
 				    ('\\' == start[0] && '-' == start[1]))
 					break;
 
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 
 				if (' ' == byte) {
 					start += sz + 1;
@@ -1403,7 +1411,7 @@ parse_man(struct mpage *mpage, const struct man_node *
 			}
 
 			if (start == title) {
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 				free(title);
 				return;
 			}
@@ -1580,8 +1588,11 @@ static int
 parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n)
 {
 
-	return(SEC_NAME == n->sec ||
-	    (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type));
+	if (SEC_NAME == n->sec)
+		putmdockey(mpage, n->child, TYPE_NAME | TYPE_Nm);
+	else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)
+		putmdockey(mpage, n->child, TYPE_Nm);
+	return(0);
 }
 
 static int
@@ -1850,20 +1861,54 @@ dbadd(struct mpage *mpage, struct mchars *mc)
 	size_t		 i;
 	unsigned int	 slot;
 
-	if (debug)
-		say(mpage->mlinks->file, "Adding to database");
+	mlink = mpage->mlinks;
 
-	if (nodb)
+	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);
 	SQL_STEP(stmts[STMT_INSERT_PAGE]);
 	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)) {