===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -c -r1.91 -r1.92
*** src/usr.bin/mandoc/mandocdb.c	2014/04/13 21:21:27	1.91
--- src/usr.bin/mandoc/mandocdb.c	2014/04/13 22:02:54	1.92
***************
*** 1,4 ****
! /*	$Id: mandocdb.c,v 1.91 2014/04/13 21:21:27 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mandocdb.c,v 1.92 2014/04/13 22:02:54 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1146,1163 ****
  			putkey(mpage, mlink->name, NAME_FILE);
  		}
  
  		if (NULL != mdoc) {
  			if (NULL != (cp = mdoc_meta(mdoc)->name))
  				putkey(mpage, cp, NAME_HEAD);
- 			assert(NULL == mpage->desc);
  			parse_mdoc(mpage, mdoc_node(mdoc));
- 			if (NULL == mpage->desc)
- 				mpage->desc = mandoc_strdup(
- 				    mpage->mlinks->name);
  		} else if (NULL != man)
  			parse_man(mpage, man_node(man));
  		else
  			parse_cat(mpage, fd[0]);
  
  		if (warnings && !use_all)
  			for (mlink = mpage->mlinks; mlink;
--- 1146,1162 ----
  			putkey(mpage, mlink->name, NAME_FILE);
  		}
  
+ 		assert(NULL == mpage->desc);
  		if (NULL != mdoc) {
  			if (NULL != (cp = mdoc_meta(mdoc)->name))
  				putkey(mpage, cp, NAME_HEAD);
  			parse_mdoc(mpage, mdoc_node(mdoc));
  		} else if (NULL != man)
  			parse_man(mpage, man_node(man));
  		else
  			parse_cat(mpage, fd[0]);
+ 		if (NULL == mpage->desc)
+ 			mpage->desc = mandoc_strdup(mpage->mlinks->name);
  
  		if (warnings && !use_all)
  			for (mlink = mpage->mlinks; mlink;
***************
*** 1294,1301 ****
  		if (warnings)
  			say(mpage->mlinks->file,
  			    "Cannot find NAME section");
- 		assert(NULL == mpage->desc);
- 		mpage->desc = mandoc_strdup(mpage->mlinks->name);
  		fclose(stream);
  		free(title);
  		return;
--- 1293,1298 ----
***************
*** 1334,1340 ****
  		plen -= 2;
  	}
  
- 	assert(NULL == mpage->desc);
  	mpage->desc = mandoc_strdup(p);
  	fclose(stream);
  	free(title);
--- 1331,1336 ----
***************
*** 1474,1480 ****
  			while (' ' == *start)
  				start++;
  
- 			assert(NULL == mpage->desc);
  			mpage->desc = mandoc_strdup(start);
  			free(title);
  			return;
--- 1470,1475 ----