[src/netbsd-7]: src/usr.sbin/makemandb Pull up following revision(s) (request...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce8fd4968eec
branches:  netbsd-7
changeset: 799083:ce8fd4968eec
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Mar 15 22:44:28 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #589):
        usr.sbin/makemandb/makemandb.c: revision 1.28
MDOC_MAX is a valid token if the type is text. Adjust.

diffstat:

 usr.sbin/makemandb/makemandb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 73dcc8ce4b18 -r ce8fd4968eec usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Sun Mar 15 22:43:02 2015 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Sun Mar 15 22:44:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 snj Exp $   */
+/*     $NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $   */
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay%gmail.com@localhost>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 snj Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -981,7 +981,7 @@
        char *temp;
        char *nd_text;
 
-       if (n == NULL || n->tok == MDOC_MAX)
+       if (n == NULL || (n->type != MDOC_TEXT && n->tok == MDOC_MAX))
                return;
 
        if (n->type == MDOC_TEXT) {
@@ -1104,7 +1104,7 @@
 static void
 pmdoc_Sh(const struct mdoc_node *n, mandb_rec *rec)
 {
-       if (n == NULL || n->tok == MDOC_MAX)
+       if (n == NULL || (n->type != MDOC_TEXT && n->tok == MDOC_MAX))
                return;
        int xr_found = 0;