===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.216
retrieving revision 1.220.2.1
diff -u -p -r1.216 -r1.220.2.1
--- mandoc/mandocdb.c	2016/03/17 21:26:26	1.216
+++ mandoc/mandocdb.c	2016/10/20 17:35:58	1.220.2.1
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.216 2016/03/17 21:26:26 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.220.2.1 2016/10/20 17:35:58 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,8 +33,10 @@
 #else
 #include "compat_fts.h"
 #endif
-#include <getopt.h>
 #include <limits.h>
+#if HAVE_SANDBOX_INIT
+#include <sandbox.h>
+#endif
 #include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -137,6 +139,9 @@ struct	mdoc_handler {
 	uint64_t	 mask;  /* set unless handler returns 0 */
 };
 
+
+int		 mandocdb(int, char *[]);
+
 static	void	 dbclose(int);
 static	void	 dbadd(struct mpage *);
 static	void	 dbadd_mlink(const struct mlink *mlink);
@@ -180,7 +185,8 @@ static	void	 putkeys(const struct mpage *, char *, siz
 static	void	 putmdockey(const struct mpage *,
 			const struct roff_node *, uint64_t);
 static	int	 render_string(char **, size_t *);
-static	void	 say(const char *, const char *, ...);
+static	void	 say(const char *, const char *, ...)
+			__attribute__((__format__ (printf, 2, 3)));
 static	int	 set_basedir(const char *, int);
 static	int	 treescan(void);
 static	size_t	 utf8(unsigned int, char [7]);
@@ -346,6 +352,13 @@ mandocdb(int argc, char *argv[])
 	}
 #endif
 
+#if HAVE_SANDBOX_INIT
+	if (sandbox_init(kSBXProfileNoInternet, SANDBOX_NAMED, NULL) == -1) {
+		warnx("sandbox_init");
+		return (int)MANDOCLEVEL_SYSERR;
+	}
+#endif
+
 	memset(&conf, 0, sizeof(conf));
 	memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
 
@@ -1758,7 +1771,7 @@ parse_mdoc_Nm(struct mpage *mpage, const struct roff_m
 	if ( ! (mpage->name_head_done ||
 	    n->child == NULL || n->child->string == NULL ||
 	    strcasecmp(n->child->string, meta->title))) {
-		putkey(mpage, n->child->string, ROFFT_HEAD);
+		putkey(mpage, n->child->string, NAME_HEAD);
 		mpage->name_head_done = 1;
 	}
 	return 0;
@@ -1806,7 +1819,7 @@ putkeys(const struct mpage *mpage, char *cp, size_t sz
 			name_mask &= ~NAME_FIRST;
 		if (debug > 1)
 			say(mpage->mlinks->file,
-			    "Adding name %*s, bits=%d", sz, cp, v);
+			    "Adding name %*s, bits=0x%llu", (int)sz, cp, v);
 	} else {
 		htab = &strings;
 		if (debug > 1)
@@ -1814,7 +1827,7 @@ putkeys(const struct mpage *mpage, char *cp, size_t sz
 			if ((uint64_t)1 << i & v)
 			    say(mpage->mlinks->file,
 				"Adding key %s=%*s",
-				mansearch_keynames[i], sz, cp);
+				mansearch_keynames[i], (int)sz, cp);
 	}
 
 	end = cp + sz;