===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.49.2.6
retrieving revision 1.49.2.14
diff -u -p -r1.49.2.6 -r1.49.2.14
--- mandoc/mandocdb.c	2013/10/01 00:52:58	1.49.2.6
+++ mandoc/mandocdb.c	2014/03/23 12:04:54	1.49.2.14
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.49.2.6 2013/10/01 00:52:58 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.49.2.14 2014/03/23 12:04:54 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,23 +34,27 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__sun)
+#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
 
-#if defined(__sun)
-#include <sys/stat.h>
-#endif
-
 #include "man.h"
 #include "mdoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "mandocdb.h"
 #include "manpath.h"
 
@@ -285,6 +289,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. */
@@ -325,8 +330,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;
@@ -349,6 +355,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) {
@@ -391,7 +400,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));
@@ -592,7 +601,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);
@@ -619,6 +628,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);
@@ -641,7 +652,7 @@ index_merge(const struct of *of, struct mparse *mp,
 		if ((MANDOC_SRC & of->src_form ||
 		    ! (MANDOC_FORM & of->src_form)) &&
 		    MANDOCLEVEL_FATAL > mparse_readfd(mp, -1, fn))
-			mparse_result(mp, &mdoc, &man);
+			mparse_result(mp, &mdoc, &man, NULL);
 
 		if (NULL != mdoc) {
 			msec = mdoc_meta(mdoc)->msec;
@@ -731,13 +742,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) {