===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.85
retrieving revision 1.87
diff -u -p -r1.85 -r1.87
--- mandoc/mandocdb.c	2013/12/27 15:48:09	1.85
+++ mandoc/mandocdb.c	2013/12/27 16:40:35	1.87
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.85 2013/12/27 15:48:09 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.87 2013/12/27 16:40:35 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -142,7 +142,6 @@ static	void	 filescan(const char *);
 static	void	*hash_alloc(size_t, void *);
 static	void	 hash_free(void *, size_t, void *);
 static	void	*hash_halloc(size_t, void *);
-static	int	 inocheck(const struct stat *);
 static	void	 mlink_add(struct mlink *, const struct stat *);
 static	void	 mlink_free(struct mlink *);
 static	void	 mpages_free(void);
@@ -558,10 +557,6 @@ treescan(void)
 				if (warnings)
 					say(path, "Extraneous file");
 				continue;
-			} else if (inocheck(ff->fts_statp)) {
-				if (warnings)
-					say(path, "Duplicate file");
-				continue;
 			} else if (NULL == (fsec =
 					strrchr(ff->fts_name, '.'))) {
 				if ( ! use_all) {
@@ -711,10 +706,6 @@ filescan(const char *file)
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say(file, "Not a regular file");
 		return;
-	} else if (inocheck(&st)) {
-		if (warnings)
-			say(file, "Duplicate file");
-		return;
 	}
 	start = buf + strlen(basedir);
 	mlink = mandoc_calloc(1, sizeof(struct mlink));
@@ -771,20 +762,6 @@ filescan(const char *file)
 	mlink_add(mlink, &st);
 }
 
-static int
-inocheck(const struct stat *st)
-{
-	struct inodev	 inodev;
-	uint32_t	 hash;
-
-	memset(&inodev, 0, sizeof(inodev));
-	inodev.st_ino = hash = st->st_ino;
-	inodev.st_dev = st->st_dev;
-
-	return(NULL != ohash_find(&mpages, ohash_lookup_memory(
-			&mpages, (char *)&inodev, sizeof(inodev), hash)));
-}
-
 static void
 mlink_add(struct mlink *mlink, const struct stat *st)
 {
@@ -1787,6 +1764,7 @@ utf8key(struct mchars *mc, struct str *key)
 static void
 dbindex(const struct mpage *mpage, struct mchars *mc)
 {
+	struct mlink	*mlink;
 	struct str	*key;
 	const char	*desc;
 	int64_t		 recno;
@@ -1826,13 +1804,15 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 	recno = sqlite3_last_insert_rowid(db);
 	sqlite3_reset(stmts[STMT_INSERT_PAGE]);
 
-	i = 1;
-	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->dsec);
-	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->arch);
-	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->file);
-	SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno);
-	SQL_STEP(stmts[STMT_INSERT_LINK]);
-	sqlite3_reset(stmts[STMT_INSERT_LINK]);
+	for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
+		i = 1;
+		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
+		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
+		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);
+		SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno);
+		SQL_STEP(stmts[STMT_INSERT_LINK]);
+		sqlite3_reset(stmts[STMT_INSERT_LINK]);
+	}
 
 	for (key = ohash_first(&strings, &slot); NULL != key;
 	     key = ohash_next(&strings, &slot)) {