Module Name: src
Committed By: christos
Date: Mon Mar 11 17:59:28 UTC 2019
Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/dist: dba.c dbm.c main.c mandocdb.c mdoc.c
read.c
Log Message:
Reduce diffs with upstream and enable the built-in database code.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/mdocml/dist/dba.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/dbm.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/main.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/mandocdb.c
cvs rdiff -u -r1.1.1.20 -r1.2 src/external/bsd/mdocml/dist/mdoc.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/mdocml/dist/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.17 src/external/bsd/mdocml/bin/mandoc/Makefile:1.18
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.17 Thu Aug 16 02:24:40 2018
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Mon Mar 11 13:59:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/08/16 06:24:40 kre Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/11 17:59:28 christos Exp $
.include <bsd.own.mk>
@@ -8,10 +8,18 @@ SRCS= \
eqn_html.c \
eqn_term.c \
html.c \
+dba.c \
+dba_array.c \
+dba_read.c \
+dba_write.c \
+dbm.c \
+dbm_map.c \
main.c \
man_html.c \
man_term.c \
+mandocdb.c \
manpath.c \
+mansearch.c \
mdoc_html.c \
mdoc_markdown.c \
mdoc_term.c \
Index: src/external/bsd/mdocml/dist/dba.c
diff -u src/external/bsd/mdocml/dist/dba.c:1.1.1.1 src/external/bsd/mdocml/dist/dba.c:1.2
--- src/external/bsd/mdocml/dist/dba.c:1.1.1.1 Sat Mar 18 11:06:52 2017
+++ src/external/bsd/mdocml/dist/dba.c Mon Mar 11 13:59:28 2019
@@ -167,7 +167,7 @@ dba_page_new(struct dba_array *pages, co
dba_array_add(page, entry);
if (arch != NULL && *arch != '\0') {
entry = dba_array_new(1, DBA_STR | DBA_GROW);
- dba_array_add(entry, (void *)arch);
+ dba_array_add(entry, __UNCONST(arch));
} else
entry = NULL;
dba_array_add(page, entry);
@@ -208,7 +208,7 @@ dba_page_add(struct dba_array *page, int
if (strcmp(entry, str) == 0)
return;
}
- dba_array_add(entries, (void *)str);
+ dba_array_add(entries, __UNCONST(str));
}
/*
Index: src/external/bsd/mdocml/dist/dbm.c
diff -u src/external/bsd/mdocml/dist/dbm.c:1.1.1.2 src/external/bsd/mdocml/dist/dbm.c:1.2
--- src/external/bsd/mdocml/dist/dbm.c:1.1.1.2 Sun Mar 10 18:28:59 2019
+++ src/external/bsd/mdocml/dist/dbm.c Mon Mar 11 13:59:28 2019
@@ -114,7 +114,7 @@ dbm_open(const char *fname)
goto fail;
}
nvals[im] = be32toh(*ep);
- macros[im] = (struct macro *)++ep;
+ macros[im] = (struct macro *)__UNCONST(++ep);
}
return 0;
Index: src/external/bsd/mdocml/dist/main.c
diff -u src/external/bsd/mdocml/dist/main.c:1.6 src/external/bsd/mdocml/dist/main.c:1.7
--- src/external/bsd/mdocml/dist/main.c:1.6 Sun Mar 10 20:15:38 2019
+++ src/external/bsd/mdocml/dist/main.c Mon Mar 11 13:59:28 2019
@@ -87,9 +87,7 @@ struct curparse {
};
-#ifdef HAVE_SQLITE3
int mandocdb(int, char *[]);
-#endif
static void check_xr(void);
static int fs_lookup(const struct manpaths *,
@@ -151,11 +149,9 @@ main(int argc, char *argv[])
#endif
mandoc_msg_setoutfile(stderr);
-#ifdef HAVE_SQLITE3
if (strncmp(progname, "mandocdb", 8) == 0 ||
strcmp(progname, BINM_MAKEWHATIS) == 0)
return mandocdb(argc, argv);
-#endif
#if HAVE_PLEDGE
if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
@@ -394,18 +390,9 @@ main(int argc, char *argv[])
/* Access the mandoc database. */
manconf_parse(&conf, conf_file, defpaths, auxpaths);
-#if HAVE_SQLITE3
if ( ! mansearch(&search, &conf.manpath,
argc, argv, &res, &sz))
usage(search.argmode);
-#else
- if (search.argmode != ARG_NAME) {
- fputs("mandoc: database support not compiled in\n",
- stderr);
- return (int)MANDOCLEVEL_BADARG;
- }
- sz = 0;
-#endif
if (sz == 0 && search.argmode == ARG_NAME)
fs_search(&search, &conf.manpath,
@@ -616,9 +603,7 @@ main(int argc, char *argv[])
out:
if (search.argmode != ARG_FILE) {
manconf_free(&conf);
-#ifdef HAVE_SQLITE3
mansearch_free(res, sz);
-#endif
}
free(curp.os_s);
@@ -932,10 +917,8 @@ check_xr(void)
search.outkey = NULL;
search.argmode = ARG_NAME;
search.firstmatch = 1;
-#ifdef HAVE_SQLITE3
if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))
continue;
-#endif
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))
continue;
if (xr->count == 1)
Index: src/external/bsd/mdocml/dist/mandocdb.c
diff -u src/external/bsd/mdocml/dist/mandocdb.c:1.5 src/external/bsd/mdocml/dist/mandocdb.c:1.6
--- src/external/bsd/mdocml/dist/mandocdb.c:1.5 Sun Mar 10 20:15:38 2019
+++ src/external/bsd/mdocml/dist/mandocdb.c Mon Mar 11 13:59:28 2019
@@ -584,8 +584,8 @@ treescan(void)
argv[0] = ".";
argv[1] = NULL;
- f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR,
- fts_compare);
+ f = fts_open((char * const *)__UNCONST(*argv),
+ FTS_PHYSICAL | FTS_NOCHDIR, fts_compare);
if (f == NULL) {
exitcode = (int)MANDOCLEVEL_SYSERR;
say("", "&fts_open");
Index: src/external/bsd/mdocml/dist/mdoc.c
diff -u src/external/bsd/mdocml/dist/mdoc.c:1.1.1.20 src/external/bsd/mdocml/dist/mdoc.c:1.2
--- src/external/bsd/mdocml/dist/mdoc.c:1.1.1.20 Sun Mar 10 18:29:00 2019
+++ src/external/bsd/mdocml/dist/mdoc.c Mon Mar 11 13:59:28 2019
@@ -30,9 +30,9 @@
#include "mandoc_aux.h"
#include "mandoc.h"
#include "roff.h"
+#include "roff_int.h"
#include "mdoc.h"
#include "libmandoc.h"
-#include "roff_int.h"
#include "libmdoc.h"
const char *const __mdoc_argnames[MDOC_ARG_MAX] = {
Index: src/external/bsd/mdocml/dist/read.c
diff -u src/external/bsd/mdocml/dist/read.c:1.20 src/external/bsd/mdocml/dist/read.c:1.21
--- src/external/bsd/mdocml/dist/read.c:1.20 Sun Mar 10 20:15:38 2019
+++ src/external/bsd/mdocml/dist/read.c Mon Mar 11 13:59:28 2019
@@ -62,7 +62,6 @@ static void choose_parser(struct mpars
static void free_buf_list(struct buf *);
static void resize_buf(struct buf *, size_t);
static int mparse_buf_r(struct mparse *, const struct buf, size_t, int);
-static int mparse_buf_r(struct mparse *, struct buf, size_t, int);
static int read_whole_file(struct mparse *, int, struct buf *, int *);
static void mparse_end(struct mparse *);
