===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.84
retrieving revision 1.86
diff -u -p -r1.84 -r1.86
--- mandoc/mandocdb.c	2013/12/27 15:39:03	1.84
+++ mandoc/mandocdb.c	2013/12/27 16:17:32	1.86
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.84 2013/12/27 15:39:03 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.86 2013/12/27 16:17:32 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -111,6 +111,7 @@ struct	mlink {
 	char		*arch;    /* architecture from directory */
 	char		*name;    /* name from file name (not empty) */
 	char		*fsec;    /* section from file name suffix */
+	struct mlink	*next;    /* singly linked list */
 };
 
 struct	title {
@@ -141,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);
@@ -557,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) {
@@ -710,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));
@@ -770,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)
 {
@@ -826,7 +804,7 @@ mlink_add(struct mlink *mlink, const struct stat *st)
 		mpage->inodev.st_dev = inodev.st_dev;
 		ohash_insert(&mpages, slot, mpage);
 	} else
-		abort();
+		mlink->next = mpage->mlinks;
 	mpage->mlinks = mlink;
 }
 
@@ -851,7 +829,7 @@ mpages_free(void)
 	mpage = ohash_first(&mpages, &slot);
 	while (NULL != mpage) {
 		while (NULL != (mlink = mpage->mlinks)) {
-			mpage->mlinks = NULL;
+			mpage->mlinks = mlink->next;
 			mlink_free(mlink);
 		}
 		free(mpage->sec);