add missing prototypes, no code change;

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 93cca9ec2c3b4ddac01f4d882a5b7570d8de5477..d5052db91a4a393b75cb2d4c1fe5d379373886a4 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.214 2016/01/08 15:02:54 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.219 2016/07/15 18:03:45 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);
@@ -346,6 +351,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 *));
 
@@ -574,7 +586,7 @@ usage:
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
- * TODO: accomodate for multi-language directories.
+ * TODO: accommodate for multi-language directories.
  */
 static int
 treescan(void)
@@ -1446,7 +1458,7 @@ parse_man(struct mpage *mpage, const struct roff_meta *meta,
        char             byte;
        size_t           sz;
 
-       if (NULL == n)
+       if (n == NULL)
                return;
 
        /*
@@ -1458,13 +1470,12 @@ parse_man(struct mpage *mpage, const struct roff_meta *meta,
 
        if (n->type == ROFFT_BODY && n->tok == MAN_SH) {
                body = n;
-               assert(body->parent);
-               if (NULL != (head = body->parent->head) &&
-                   1 == head->nchild &&
-                   NULL != (head = (head->child)) &&
+               if ((head = body->parent->head) != NULL &&
+                   (head = head->child) != NULL &&
+                   head->next == NULL &&
                    head->type == ROFFT_TEXT &&
-                   0 == strcmp(head->string, "NAME") &&
-                   NULL != body->child) {
+                   strcmp(head->string, "NAME") == 0 &&
+                   body->child != NULL) {
 
                        /*
                         * Suck the entire NAME section into memory.
@@ -1697,7 +1708,9 @@ parse_mdoc_Va(struct mpage *mpage, const struct roff_meta *meta,
        if (n->type != ROFFT_ELEM && n->type != ROFFT_BODY)
                return 0;
 
-       if (n->nchild == 1 && n->child->type == ROFFT_TEXT)
+       if (n->child != NULL &&
+           n->child->next == NULL &&
+           n->child->type == ROFFT_TEXT)
                return 1;
 
        cp = NULL;