[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/fff91bc4eef6
branches:  netbsd-7
changeset: 799057:fff91bc4eef6
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Mar 07 06:21:08 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #564):
        usr.sbin/makemandb/makemandb.c: revision 1.26
Explicitly deal with end of lists. PR 49708.

diffstat:

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

diffs (36 lines):

diff -r a7e5e02515da -r fff91bc4eef6 usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Sat Mar 07 06:06:24 2015 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Sat Mar 07 06:21:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makemandb.c,v 1.24 2014/06/03 14:42:41 wiz Exp $       */
+/*     $NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 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 2014/06/03 14:42:41 wiz Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 snj Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -981,7 +981,7 @@
        char *temp;
        char *nd_text;
 
-       if (n == NULL)
+       if (n == NULL || 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)
+       if (n == NULL || n->tok == MDOC_MAX)
                return;
        int xr_found = 0;