===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.49.2.4
retrieving revision 1.49.2.12
diff -u -p -r1.49.2.4 -r1.49.2.12
--- mandoc/mandocdb.c	2013/09/17 23:12:21	1.49.2.4
+++ mandoc/mandocdb.c	2014/03/19 22:09:29	1.49.2.12
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.49.2.4 2013/09/17 23:12:21 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.49.2.12 2014/03/19 22:09:29 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,12 +34,19 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__linux__)
+#if defined(__APPLE__)
+# include <libkern/OSByteOrder.h>
+#elif defined(__linux__)
 # include <endian.h>
+#elif defined(__sun)
+# include <sys/byteorder.h>
+# include <sys/stat.h>
+#else
+# include <sys/endian.h>
+#endif
+
+#if defined(__linux__) || defined(__sun)
 # include <db_185.h>
-#elif defined(__APPLE__)
-# include <libkern/OSByteOrder.h>
-# include <db.h>
 #else
 # include <db.h>
 #endif
@@ -281,6 +288,7 @@ static	const struct mdoc_handler mdocs[MDOC_MAX] = {
 };
 
 static	const char	 *progname;
+static	int		  mparse_options;  /* abort the parse early */
 static	int		  use_all;  /* Use all directories and files. */
 static	int		  verb;  /* Output verbosity level. */
 static	int		  warnings;  /* Potential problems in manuals. */
@@ -321,8 +329,9 @@ main(int argc, char *argv[])
 	hash = NULL;
 	op = OP_DEFAULT;
 	dir = NULL;
+	mparse_options = MPARSE_SO;
 
-	while (-1 != (ch = getopt(argc, argv, "aC:d:tu:vW")))
+	while (-1 != (ch = getopt(argc, argv, "aC:d:Qtu:vW")))
 		switch (ch) {
 		case ('a'):
 			use_all = 1;
@@ -345,6 +354,9 @@ main(int argc, char *argv[])
 			dir = optarg;
 			op = OP_UPDATE;
 			break;
+		case ('Q'):
+			mparse_options |= MPARSE_QUICK;
+			break;
 		case ('t'):
 			dup2(STDOUT_FILENO, STDERR_FILENO);
 			if (op) {
@@ -387,7 +399,7 @@ main(int argc, char *argv[])
 	info.lorder = 4321;
 	info.flags = R_DUP;
 
-	mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, NULL);
+	mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, NULL);
 
 	memset(&buf, 0, sizeof(struct buf));
 	memset(&dbuf, 0, sizeof(struct buf));
@@ -588,7 +600,7 @@ out:
 
 usage:
 	fprintf(stderr,
-		"usage: %s [-avvv] [-C file] | dir ... | -t file ...\n"
+		"usage: %s [-aQvvv] [-C file] | dir ... | -t file ...\n"
 		"                        -d dir [file ...] | "
 		"-u dir [file ...]\n",
 		progname);
@@ -615,6 +627,8 @@ index_merge(const struct of *of, struct mparse *mp,
 	uint64_t	 vbuf[2];
 	char		 type;
 
+	static char	 emptystring[] = "";
+
 	if (warnings) {
 		files = NULL;
 		hash_reset(&files);
@@ -727,13 +741,13 @@ index_merge(const struct of *of, struct mparse *mp,
 			}
 			buf_appendb(buf, ")", 2);
 			for (p = buf->cp; '\0' != *p; p++)
-				*p = tolower(*p);
+				*p = tolower((unsigned char)*p);
 			key.data = buf->cp;
 			key.size = buf->len;
 			val.data = NULL;
 			val.size = 0;
 			if (0 == skip)
-				val.data = "";
+				val.data = emptystring;
 			else {
 				ch = (*files->get)(files, &key, &val, 0);
 				if (ch < 0) {
@@ -1747,7 +1761,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 +1770,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 +1795,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 +1857,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",