===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -c -r1.84 -r1.85
*** src/usr.bin/mandoc/mandocdb.c	2014/04/03 21:45:27	1.84
--- src/usr.bin/mandoc/mandocdb.c	2014/04/04 02:31:01	1.85
***************
*** 1,4 ****
! /*	$Id: mandocdb.c,v 1.84 2014/04/03 21:45: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.85 2014/04/04 02:31:01 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1850,1869 ****
  	size_t		 i;
  	unsigned int	 slot;
  
! 	if (debug)
! 		say(mpage->mlinks->file, "Adding to database");
  
! 	if (nodb)
  		return;
  
  	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)
  		dbadd_mlink(mlink);
  
  	for (key = ohash_first(&strings, &slot); NULL != key;
  	     key = ohash_next(&strings, &slot)) {
--- 1850,1903 ----
  	size_t		 i;
  	unsigned int	 slot;
  
! 	mlink = mpage->mlinks;
  
! 	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]);
  
! 	while (NULL != mlink) {
  		dbadd_mlink(mlink);
+ 		mlink = mlink->next;
+ 	}
  
  	for (key = ohash_first(&strings, &slot); NULL != key;
  	     key = ohash_next(&strings, &slot)) {