===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.255
retrieving revision 1.258
diff -u -p -r1.255 -r1.258
--- mandoc/mandocdb.c	2017/08/26 15:55:46	1.255
+++ mandoc/mandocdb.c	2018/02/23 18:25:57	1.258
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.255 2017/08/26 15:55:46 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.258 2018/02/23 18:25:57 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -139,6 +139,8 @@ static	void	 parse_mdoc(struct mpage *, const struct r
 			const struct roff_node *);
 static	int	 parse_mdoc_head(struct mpage *, const struct roff_meta *,
 			const struct roff_node *);
+static	int	 parse_mdoc_Fa(struct mpage *, const struct roff_meta *,
+			const struct roff_node *);
 static	int	 parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
 			const struct roff_node *);
 static	void	 parse_mdoc_fname(struct mpage *, const struct roff_node *);
@@ -207,11 +209,11 @@ static	const struct mdoc_handler __mdocs[MDOC_MAX - MD
 	{ NULL, TYPE_Er, 0 },  /* Er */
 	{ NULL, TYPE_Ev, 0 },  /* Ev */
 	{ NULL, 0, 0 },  /* Ex */
-	{ NULL, TYPE_Fa, 0 },  /* Fa */
+	{ parse_mdoc_Fa, 0, 0 },  /* Fa */
 	{ parse_mdoc_Fd, 0, 0 },  /* Fd */
 	{ NULL, TYPE_Fl, 0 },  /* Fl */
 	{ parse_mdoc_Fn, 0, 0 },  /* Fn */
-	{ NULL, TYPE_Ft, 0 },  /* Ft */
+	{ NULL, TYPE_Ft | TYPE_Vt, 0 },  /* Ft */
 	{ NULL, TYPE_Ic, 0 },  /* Ic */
 	{ NULL, TYPE_In, 0 },  /* In */
 	{ NULL, TYPE_Li, 0 },  /* Li */
@@ -1373,7 +1375,12 @@ parse_cat(struct mpage *mpage, int fd)
 		plen -= 2;
 	}
 
-	mpage->desc = mandoc_strdup(p);
+	/*
+	 * Cut off excessive one-line descriptions.
+	 * Bad pages are not worth better heuristics.
+	 */
+
+	mpage->desc = mandoc_strndup(p, 150);
 	fclose(stream);
 	free(title);
 }
@@ -1517,7 +1524,12 @@ parse_man(struct mpage *mpage, const struct roff_meta 
 			while (' ' == *start)
 				start++;
 
-			mpage->desc = mandoc_strdup(start);
+			/*
+			 * Cut off excessive one-line descriptions.
+			 * Bad pages are not worth better heuristics.
+			 */
+
+			mpage->desc = mandoc_strndup(start, 150);
 			free(title);
 			return;
 		}
@@ -1563,6 +1575,20 @@ parse_mdoc(struct mpage *mpage, const struct roff_meta
 }
 
 static int
+parse_mdoc_Fa(struct mpage *mpage, const struct roff_meta *meta,
+	const struct roff_node *n)
+{
+	uint64_t mask;
+
+	mask = TYPE_Fa;
+	if (n->sec == SEC_SYNOPSIS)
+		mask |= TYPE_Vt;
+
+	putmdockey(mpage, n->child, mask, 0);
+	return 0;
+}
+
+static int
 parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
 	const struct roff_node *n)
 {
@@ -1631,15 +1657,20 @@ static int
 parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
 	const struct roff_node *n)
 {
+	uint64_t mask;
 
 	if (n->child == NULL)
 		return 0;
 
 	parse_mdoc_fname(mpage, n->child);
 
-	for (n = n->child->next; n != NULL; n = n->next)
-		if (n->type == ROFFT_TEXT)
-			putkey(mpage, n->string, TYPE_Fa);
+	n = n->child->next;
+	if (n != NULL && n->type == ROFFT_TEXT) {
+		mask = TYPE_Fa;
+		if (n->sec == SEC_SYNOPSIS)
+			mask |= TYPE_Vt;
+		putmdockey(mpage, n, mask, 0);
+	}
 
 	return 0;
 }
@@ -2152,7 +2183,7 @@ dbwrite(struct dba *dba)
 		say("", "&%s", tfn);
 		return;
 	}
-	cp1 = cp2 = NULL;
+	cp1 = cp2 = MAP_FAILED;
 	fd1 = fd2 = -1;
 	(void)strlcat(tfn, "/" MANDOC_DB, sizeof(tfn));
 	if (dba_write(tfn, dba) == -1) {
@@ -2178,12 +2209,12 @@ dbwrite(struct dba *dba)
 	if (sb1.st_size != sb2.st_size)
 		goto err;
 	if ((cp1 = mmap(NULL, sb1.st_size, PROT_READ, MAP_PRIVATE,
-	    fd1, 0)) == NULL) {
+	    fd1, 0)) == MAP_FAILED) {
 		say(MANDOC_DB, "&mmap");
 		goto err;
 	}
 	if ((cp2 = mmap(NULL, sb2.st_size, PROT_READ, MAP_PRIVATE,
-	    fd2, 0)) == NULL) {
+	    fd2, 0)) == MAP_FAILED) {
 		say(tfn, "&mmap");
 		goto err;
 	}
@@ -2197,9 +2228,9 @@ err:
 	say(MANDOC_DB, "Data changed, but cannot replace database");
 
 out:
-	if (cp1 != NULL)
+	if (cp1 != MAP_FAILED)
 		munmap(cp1, sb1.st_size);
-	if (cp2 != NULL)
+	if (cp2 != MAP_FAILED)
 		munmap(cp2, sb2.st_size);
 	if (fd1 != -1)
 		close(fd1);