===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.6
diff -u -p -r1.49.2.3 -r1.49.2.6
--- mandoc/mandocdb.c	2013/09/17 23:07:22	1.49.2.3
+++ mandoc/mandocdb.c	2013/10/01 00:52:58	1.49.2.6
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.49.2.3 2013/09/17 23:07:22 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.49.2.6 2013/10/01 00:52:58 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__sun)
 # include <endian.h>
 # include <db_185.h>
 #elif defined(__APPLE__)
@@ -44,6 +44,10 @@
 # include <db.h>
 #endif
 
+#if defined(__sun)
+#include <sys/stat.h>
+#endif
+
 #include "man.h"
 #include "mdoc.h"
 #include "mandoc.h"
@@ -299,7 +303,7 @@ main(int argc, char *argv[])
 	int		 ch, i, flags;
 	DB		*hash; /* temporary keyword hashtable */
 	BTREEINFO	 info; /* btree configuration */
-	size_t		 sz1, sz2;
+	size_t		 sz1, sz2, ipath;
 	struct buf	 buf, /* keyword buffer */
 			 dbuf; /* description buffer */
 	struct of	*of; /* list of files for processing */
@@ -482,7 +486,7 @@ main(int argc, char *argv[])
 	} else
 		manpath_parse(&dirs, dir, NULL, NULL);
 
-	for (i = 0; i < dirs.sz; i++) {
+	for (ipath = 0; ipath < dirs.sz; ipath++) {
 
 		/*
 		 * Go to the root of the respective manual tree.
@@ -490,8 +494,8 @@ main(int argc, char *argv[])
 		 * They are indexed relative to the root.
 		 */
 
-		if (-1 == chdir(dirs.paths[i])) {
-			perror(dirs.paths[i]);
+		if (-1 == chdir(dirs.paths[ipath])) {
+			perror(dirs.paths[ipath]);
 			exit((int)MANDOCLEVEL_SYSERR);
 		}
 
@@ -1747,7 +1751,7 @@ ofile_argbuild(int argc, char *argv[], struct of **of,
  * Recursively build up a list of files to parse.
  * We use this instead of ftw() and so on because I don't want global
  * variables hanging around.
- * This ignores the mandocdb.db and mandocdb.index files, but assumes that
+ * This ignores the mandoc.db and mandoc.index files, but assumes that
  * everything else is a manual.
  * Pass in a pointer to a NULL structure for the first invocation.
  */
@@ -1756,6 +1760,9 @@ ofile_dirbuild(const char *dir, const char* psec, cons
 		int p_src_form, struct of **of)
 {
 	char		 buf[PATH_MAX];
+#if defined(__sun)
+	struct stat	 sb;
+#endif
 	size_t		 sz;
 	DIR		*d;
 	const char	*fn, *sec, *arch;
@@ -1778,7 +1785,12 @@ ofile_dirbuild(const char *dir, const char* psec, cons
 
 		src_form = p_src_form;
 
+#if defined(__sun)
+		stat(dp->d_name, &sb);
+		if (S_IFDIR & sb.st_mode) {
+#else
 		if (DT_DIR == dp->d_type) {
+#endif
 			sec = psec;
 			arch = parch;
 
@@ -1835,7 +1847,11 @@ ofile_dirbuild(const char *dir, const char* psec, cons
 			continue;
 		}
 
+#if defined(__sun)
+		if (0 == S_IFREG & sb.st_mode) {
+#else
 		if (DT_REG != dp->d_type) {
+#endif
 			if (warnings)
 				fprintf(stderr,
 				    "%s/%s: not a regular file\n",