git: 6d38604fc532 - main - mandoc: import version 1.14.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Nov 2021 15:59:59 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d38604fc532a3fc060788e3ce40464b46047eaf
commit 6d38604fc532a3fc060788e3ce40464b46047eaf
Merge: 9e9c651caceb e9bf778aefc1
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-11-15 15:54:38 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-11-15 15:58:58 +0000
mandoc: import version 1.14.6
MFC after: 3 weeks
contrib/mandoc/INSTALL | 17 +-
contrib/mandoc/LICENSE | 6 +-
contrib/mandoc/Makefile | 64 ++-
contrib/mandoc/Makefile.depend | 38 +-
contrib/mandoc/NEWS | 201 ++++++-
contrib/mandoc/TODO | 142 ++++-
contrib/mandoc/apropos.1 | 15 +-
contrib/mandoc/arch.c | 4 +-
contrib/mandoc/att.c | 4 +-
contrib/mandoc/catman.c | 4 +-
contrib/mandoc/cgi.c | 72 ++-
contrib/mandoc/chars.c | 7 +-
contrib/mandoc/compat_err.c | 13 +-
contrib/mandoc/compat_fts.c | 29 +-
contrib/mandoc/compat_fts.h | 3 +-
contrib/mandoc/compat_getline.c | 13 +-
contrib/mandoc/compat_getsubopt.c | 13 +-
contrib/mandoc/compat_isblank.c | 14 +-
contrib/mandoc/compat_mkdtemp.c | 23 +-
contrib/mandoc/compat_mkstemps.c | 63 +++
contrib/mandoc/compat_ohash.c | 13 +-
contrib/mandoc/compat_progname.c | 15 +-
contrib/mandoc/compat_reallocarray.c | 15 +-
contrib/mandoc/compat_recallocarray.c | 25 +-
contrib/mandoc/compat_strcasestr.c | 13 +-
contrib/mandoc/compat_stringlist.c | 82 +--
contrib/mandoc/compat_stringlist.h | 43 +-
contrib/mandoc/compat_strlcat.c | 62 +--
contrib/mandoc/compat_strlcpy.c | 49 +-
contrib/mandoc/compat_strndup.c | 16 +-
contrib/mandoc/compat_strsep.c | 15 +-
contrib/mandoc/compat_strtonum.c | 15 +-
contrib/mandoc/compat_vasprintf.c | 13 +-
contrib/mandoc/config.h | 8 +-
contrib/mandoc/configure | 313 ++++++-----
contrib/mandoc/configure.local.example | 71 ++-
contrib/mandoc/dba_array.c | 4 +-
contrib/mandoc/dba_read.c | 4 +-
contrib/mandoc/eqn.7 | 55 +-
contrib/mandoc/eqn.c | 14 +-
contrib/mandoc/html.c | 337 ++++++++----
contrib/mandoc/html.h | 36 +-
contrib/mandoc/libmandoc.h | 14 +-
contrib/mandoc/main.c | 961 +++++++++++++++++++--------------
contrib/mandoc/man.1 | 98 ++--
contrib/mandoc/man.7 | 55 +-
contrib/mandoc/man.conf.5 | 14 +-
contrib/mandoc/man_html.c | 43 +-
contrib/mandoc/man_macro.c | 12 +-
contrib/mandoc/man_term.c | 132 +----
contrib/mandoc/man_validate.c | 157 +++++-
contrib/mandoc/manconf.h | 10 +-
contrib/mandoc/mandoc.1 | 141 ++++-
contrib/mandoc/mandoc.c | 85 +--
contrib/mandoc/mandoc.css | 7 +-
contrib/mandoc/mandoc.h | 22 +-
contrib/mandoc/mandoc_char.7 | 21 +-
contrib/mandoc/mandoc_headers.3 | 79 ++-
contrib/mandoc/mandoc_html.3 | 270 ++++++++-
contrib/mandoc/mandoc_malloc.3 | 41 +-
contrib/mandoc/mandoc_msg.c | 17 +-
contrib/mandoc/mandoc_ohash.c | 4 +-
contrib/mandoc/mandoc_parse.h | 3 +-
contrib/mandoc/mandoc_xr.c | 4 +-
contrib/mandoc/mandocd.c | 4 +-
contrib/mandoc/mandocdb.c | 247 ++++++---
contrib/mandoc/manpath.c | 48 +-
contrib/mandoc/mdoc.7 | 183 +++++--
contrib/mandoc/mdoc.c | 13 +-
contrib/mandoc/mdoc_html.c | 385 ++++++-------
contrib/mandoc/mdoc_macro.c | 7 +-
contrib/mandoc/mdoc_man.c | 124 +++--
contrib/mandoc/mdoc_markdown.c | 55 +-
contrib/mandoc/mdoc_state.c | 5 +-
contrib/mandoc/mdoc_term.c | 440 ++++++---------
contrib/mandoc/mdoc_validate.c | 527 ++++++++++++------
contrib/mandoc/out.c | 75 ++-
contrib/mandoc/out.h | 6 +-
contrib/mandoc/read.c | 31 +-
contrib/mandoc/roff.7 | 8 +-
contrib/mandoc/roff.c | 233 +++++---
contrib/mandoc/roff.h | 17 +-
contrib/mandoc/roff_html.c | 4 +-
contrib/mandoc/roff_int.h | 5 +-
contrib/mandoc/roff_term.c | 56 +-
contrib/mandoc/roff_validate.c | 10 +-
contrib/mandoc/soelim.c | 8 +-
contrib/mandoc/tag.c | 415 +++++++-------
contrib/mandoc/tag.h | 35 +-
contrib/mandoc/tbl.7 | 13 +-
contrib/mandoc/tbl.h | 7 +-
contrib/mandoc/tbl_data.c | 53 +-
contrib/mandoc/tbl_html.c | 42 +-
contrib/mandoc/tbl_layout.c | 63 ++-
contrib/mandoc/tbl_term.c | 60 +-
contrib/mandoc/term.c | 25 +-
contrib/mandoc/term_ascii.c | 32 +-
contrib/mandoc/term_ps.c | 9 +-
contrib/mandoc/term_tab.c | 4 +-
contrib/mandoc/term_tag.c | 227 ++++++++
contrib/mandoc/term_tag.h | 34 ++
contrib/mandoc/test-attribute.c | 48 ++
contrib/mandoc/test-mkstemps.c | 12 +
contrib/mandoc/tree.c | 201 +++++--
usr.bin/mandoc/Makefile | 1 +
105 files changed, 5029 insertions(+), 2896 deletions(-)
diff --cc contrib/mandoc/Makefile
index f4e29540df00,000000000000..48c4741812b6
mode 100644,000000..100644
--- a/contrib/mandoc/Makefile
+++ b/contrib/mandoc/Makefile
@@@ -1,603 -1,0 +1,609 @@@
- # $Id: Makefile,v 1.530 2019/03/06 16:08:41 schwarze Exp $
++# $Id: Makefile,v 1.540 2021/09/21 11:04:40 schwarze Exp $
+#
++# Copyright (c) 2011, 2013-2021 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- # Copyright (c) 2011, 2013-2019 Ingo Schwarze <schwarze@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
- VERSION = 1.14.5
++VERSION = 1.14.6
+
+# === LIST OF FILES ====================================================
+
- TESTSRCS = test-be32toh.c \
++TESTSRCS = test-attribute.c \
++ test-be32toh.c \
+ test-cmsg.c \
+ test-dirent-namlen.c \
+ test-EFTYPE.c \
+ test-err.c \
+ test-fts.c \
+ test-getline.c \
+ test-getsubopt.c \
+ test-isblank.c \
+ test-mkdtemp.c \
++ test-mkstemps.c \
+ test-nanosleep.c \
+ test-noop.c \
+ test-ntohl.c \
+ test-O_DIRECTORY.c \
+ test-ohash.c \
+ test-PATH_MAX.c \
+ test-pledge.c \
+ test-progname.c \
+ test-reallocarray.c \
+ test-recallocarray.c \
+ test-recvmsg.c \
+ test-rewb-bsd.c \
+ test-rewb-sysv.c \
+ test-sandbox_init.c \
+ test-strcasestr.c \
+ test-stringlist.c \
+ test-strlcat.c \
+ test-strlcpy.c \
+ test-strndup.c \
+ test-strptime.c \
+ test-strsep.c \
+ test-strtonum.c \
+ test-vasprintf.c \
+ test-wchar.c
+
+SRCS = arch.c \
+ att.c \
+ catman.c \
+ cgi.c \
+ chars.c \
+ compat_err.c \
+ compat_fts.c \
+ compat_getline.c \
+ compat_getsubopt.c \
+ compat_isblank.c \
+ compat_mkdtemp.c \
++ compat_mkstemps.c \
+ compat_ohash.c \
+ compat_progname.c \
+ compat_reallocarray.c \
+ compat_recallocarray.c \
+ compat_strcasestr.c \
+ compat_stringlist.c \
+ compat_strlcat.c \
+ compat_strlcpy.c \
+ compat_strndup.c \
+ compat_strsep.c \
+ compat_strtonum.c \
+ compat_vasprintf.c \
+ dba.c \
+ dba_array.c \
+ dba_read.c \
+ dba_write.c \
+ dbm.c \
+ dbm_map.c \
+ demandoc.c \
+ eqn.c \
+ eqn_html.c \
+ eqn_term.c \
+ html.c \
+ lib.c \
+ main.c \
+ man.c \
+ man_html.c \
+ man_macro.c \
+ man_term.c \
+ man_validate.c \
+ mandoc.c \
+ mandoc_aux.c \
+ mandoc_msg.c \
+ mandoc_ohash.c \
+ mandoc_xr.c \
+ mandocd.c \
+ mandocdb.c \
+ manpath.c \
+ mansearch.c \
+ mdoc.c \
+ mdoc_argv.c \
+ mdoc_html.c \
+ mdoc_macro.c \
+ mdoc_man.c \
+ mdoc_markdown.c \
+ mdoc_state.c \
+ mdoc_term.c \
+ mdoc_validate.c \
+ msec.c \
+ out.c \
+ preconv.c \
+ read.c \
+ roff.c \
+ roff_html.c \
+ roff_term.c \
+ roff_validate.c \
+ soelim.c \
+ st.c \
+ tag.c \
+ tbl.c \
+ tbl_data.c \
+ tbl_html.c \
+ tbl_layout.c \
+ tbl_opts.c \
+ tbl_term.c \
+ term.c \
+ term_ascii.c \
+ term_ps.c \
+ term_tab.c \
++ term_tag.c \
+ tree.c
+
+DISTFILES = INSTALL \
+ LICENSE \
+ Makefile \
+ Makefile.depend \
+ NEWS \
+ TODO \
+ apropos.1 \
+ catman.8 \
+ cgi.h.example \
+ compat_fts.h \
+ compat_ohash.h \
+ compat_stringlist.h \
+ configure \
+ configure.local.example \
+ dba.h \
+ dba_array.h \
+ dba_write.h \
+ dbm.h \
+ dbm_map.h \
+ demandoc.1 \
+ eqn.7 \
+ eqn.h \
+ eqn_parse.h \
+ gmdiff \
+ html.h \
+ lib.in \
+ libman.h \
+ libmandoc.h \
+ libmdoc.h \
+ main.h \
+ makewhatis.8 \
+ man.1 \
+ man.7 \
+ man.cgi.3 \
+ man.cgi.8 \
+ man.conf.5 \
+ man.h \
+ man.options.1 \
+ manconf.h \
+ mandoc.1 \
+ mandoc.3 \
+ mandoc.css \
+ mandoc.db.5 \
+ mandoc.h \
+ mandoc_aux.h \
+ mandoc_char.7 \
+ mandoc_escape.3 \
+ mandoc_headers.3 \
+ mandoc_html.3 \
+ mandoc_malloc.3 \
+ mandoc_ohash.h \
+ mandoc_parse.h \
+ mandoc_xr.h \
+ mandocd.8 \
+ mansearch.3 \
+ mansearch.h \
+ mchars_alloc.3 \
+ mdoc.7 \
+ mdoc.h \
+ msec.in \
+ out.h \
+ predefs.in \
+ roff.7 \
+ roff.h \
+ roff_int.h \
+ soelim.1 \
+ tag.h \
+ tbl.3 \
+ tbl.7 \
+ tbl.h \
+ tbl_int.h \
+ tbl_parse.h \
+ term.h \
++ term_tag.h \
+ $(SRCS) \
+ $(TESTSRCS)
+
+LIBMAN_OBJS = man.o \
+ man_macro.o \
+ man_validate.o
+
+LIBMDOC_OBJS = att.o \
+ lib.o \
+ mdoc.o \
+ mdoc_argv.o \
+ mdoc_macro.o \
+ mdoc_state.o \
+ mdoc_validate.o \
+ st.o
+
+LIBROFF_OBJS = eqn.o \
+ roff.o \
+ roff_validate.o \
+ tbl.o \
+ tbl_data.o \
+ tbl_layout.o \
+ tbl_opts.o
+
+LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
+ $(LIBMDOC_OBJS) \
+ $(LIBROFF_OBJS) \
+ arch.o \
+ chars.o \
+ mandoc.o \
+ mandoc_aux.o \
+ mandoc_msg.o \
+ mandoc_ohash.o \
+ mandoc_xr.o \
+ msec.o \
+ preconv.o \
- read.o
++ read.o \
++ tag.o
+
- COMPAT_OBJS = compat_err.o \
++ALL_COBJS = compat_err.o \
+ compat_fts.o \
+ compat_getline.o \
+ compat_getsubopt.o \
+ compat_isblank.o \
+ compat_mkdtemp.o \
++ compat_mkstemps.o \
+ compat_ohash.o \
+ compat_progname.o \
+ compat_reallocarray.o \
+ compat_recallocarray.o \
+ compat_strcasestr.o \
++ compat_stringlist.o \
+ compat_strlcat.o \
+ compat_strlcpy.o \
+ compat_strndup.o \
+ compat_strsep.o \
+ compat_strtonum.o \
+ compat_vasprintf.o
+
+MANDOC_HTML_OBJS = eqn_html.o \
+ html.o \
+ man_html.o \
+ mdoc_html.o \
+ roff_html.o \
+ tbl_html.o
+
+MANDOC_TERM_OBJS = eqn_term.o \
+ man_term.o \
+ mdoc_term.o \
+ roff_term.o \
+ term.o \
+ term_ascii.o \
+ term_ps.o \
+ term_tab.o \
++ term_tag.o \
+ tbl_term.o
+
+DBM_OBJS = dbm.o \
+ dbm_map.o \
+ mansearch.o
+
+DBA_OBJS = dba.o \
+ dba_array.o \
+ dba_read.o \
+ dba_write.o \
+ mandocdb.o
+
+MAIN_OBJS = $(MANDOC_HTML_OBJS) \
+ $(MANDOC_MAN_OBJS) \
+ $(MANDOC_TERM_OBJS) \
+ $(DBM_OBJS) \
+ $(DBA_OBJS) \
+ main.o \
+ manpath.o \
+ mdoc_man.o \
+ mdoc_markdown.o \
+ out.o \
- tag.o \
+ tree.o
+
+CGI_OBJS = $(MANDOC_HTML_OBJS) \
+ $(DBM_OBJS) \
+ cgi.o \
+ out.o
+
+MANDOCD_OBJS = $(MANDOC_HTML_OBJS) \
+ $(MANDOC_TERM_OBJS) \
+ mandocd.o \
- out.o \
- tag.o
++ out.o
+
+DEMANDOC_OBJS = demandoc.o
+
- SOELIM_OBJS = soelim.o \
- compat_err.o \
- compat_getline.o \
- compat_progname.o \
- compat_reallocarray.o \
- compat_stringlist.o
-
+WWW_MANS = apropos.1.html \
+ demandoc.1.html \
+ man.1.html \
+ man.options.1.html \
+ mandoc.1.html \
+ soelim.1.html \
+ man.cgi.3.html \
+ mandoc.3.html \
+ mandoc_escape.3.html \
+ mandoc_headers.3.html \
+ mandoc_html.3.html \
+ mandoc_malloc.3.html \
+ mansearch.3.html \
+ mchars_alloc.3.html \
+ tbl.3.html \
+ man.conf.5.html \
+ mandoc.db.5.html \
+ eqn.7.html \
+ man.7.html \
+ mandoc_char.7.html \
+ mdoc.7.html \
+ roff.7.html \
+ tbl.7.html \
+ catman.8.html \
+ makewhatis.8.html \
+ man.cgi.8.html \
+ mandocd.8.html
+
+WWW_INCS = eqn.h.html \
+ html.h.html \
+ man.h.html \
+ manconf.h.html \
+ mandoc.h.html \
+ mandoc_aux.h.html \
+ mandoc_parse.h.html \
+ mansearch.h.html \
+ mdoc.h.html \
+ roff.h.html \
+ tbl.h.html \
+ tbl_int.h.html \
+ tbl_parse.h.html
+
+# === USER CONFIGURATION ===============================================
+
+include Makefile.local
+
+# === DEPENDENCY HANDLING ==============================================
+
- all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
++all: mandoc man demandoc soelim $(BUILD_TARGETS) Makefile.local
+
+install: base-install $(INSTALL_TARGETS)
+
+www: $(WWW_MANS) $(WWW_INCS)
+
+$(WWW_MANS) $(WWW_INCS): mandoc
+
+.PHONY: base-install cgi-install install www-install
+.PHONY: clean distclean depend
+
+include Makefile.depend
+
+# === TARGETS CONTAINING SHELL COMMANDS ================================
+
+distclean: clean
+ rm -f Makefile.local config.h config.h.old config.log config.log.old
+
+clean:
- rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
- rm -f mandoc $(MAIN_OBJS)
++ rm -f libmandoc.a $(LIBMANDOC_OBJS) $(ALL_COBJS)
++ rm -f mandoc man $(MAIN_OBJS)
+ rm -f man.cgi $(CGI_OBJS)
+ rm -f mandocd catman catman.o $(MANDOCD_OBJS)
+ rm -f demandoc $(DEMANDOC_OBJS)
- rm -f soelim $(SOELIM_OBJS)
++ rm -f soelim soelim.o
+ rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
++ rm -f Makefile.tmp1 Makefile.tmp2
+ rm -rf *.dSYM
+
+base-install: mandoc demandoc soelim
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(SBINDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/man5
+ mkdir -p $(DESTDIR)$(MANDIR)/man7
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+ cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+ cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
+ cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_WHATIS)
+ cd $(DESTDIR)$(SBINDIR) && \
+ $(LN) ${BIN_FROM_SBIN}/mandoc $(BINM_MAKEWHATIS)
+ $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
+ $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
+ $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+ cd $(DESTDIR)$(MANDIR)/man1 && $(LN) $(BINM_APROPOS).1 $(BINM_WHATIS).1
+ $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
+ $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
+ $(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MDOC).7
+ $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_ROFF).7
+ $(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_EQN).7
+ $(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_TBL).7
+ $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+ $(INSTALL_MAN) makewhatis.8 \
+ $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+
+lib-install: libmandoc.a
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man3
+ $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
+ mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+ mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+
+cgi-install: man.cgi
+ mkdir -p $(DESTDIR)$(CGIBINDIR)
+ mkdir -p $(DESTDIR)$(HTDOCDIR)
+ $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
+
+catman-install: mandocd catman
+ mkdir -p $(DESTDIR)$(SBINDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_PROGRAM) mandocd $(DESTDIR)$(SBINDIR)
+ $(INSTALL_PROGRAM) catman $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN)
+ $(INSTALL_MAN) mandocd.8 $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_MAN) catman.8 $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8
+
+uninstall:
+ rm -f $(DESTDIR)$(BINDIR)/mandoc
+ rm -f $(DESTDIR)$(BINDIR)/demandoc
+ rm -f $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+ rm -f $(DESTDIR)$(BINDIR)/$(BINM_MAN)
+ rm -f $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+ rm -f $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+ rm -f $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+ rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
+ rm -f $(DESTDIR)$(MANDIR)/man1/demandoc.1
+ rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
+ rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
+ rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+ rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+ rm -f $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
+ rm -f $(DESTDIR)$(MANDIR)/man5/mandoc.db.5
+ rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
+ rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MDOC).7
+ rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_ROFF).7
+ rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_EQN).7
+ rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_TBL).7
+ rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
+ rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+ rm -f $(DESTDIR)$(CGIBINDIR)/man.cgi
+ rm -f $(DESTDIR)$(HTDOCDIR)/mandoc.css
+ rm -f $(DESTDIR)$(SBINDIR)/mandocd
+ rm -f $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN)
+ rm -f $(DESTDIR)$(MANDIR)/man8/mandocd.8
+ rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8
+ rm -f $(DESTDIR)$(LIBDIR)/libmandoc.a
+ rm -f $(DESTDIR)$(MANDIR)/man3/mandoc.3
+ rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_escape.3
+ rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_malloc.3
+ rm -f $(DESTDIR)$(MANDIR)/man3/mansearch.3
+ rm -f $(DESTDIR)$(MANDIR)/man3/mchars_alloc.3
+ rm -f $(DESTDIR)$(MANDIR)/man3/tbl.3
+ rm -f $(DESTDIR)$(INCLUDEDIR)/eqn.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/man.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_parse.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
+ [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
+
+regress: all
+ cd regress && ./regress.pl
+
+regress-clean:
+ cd regress && ./regress.pl . clean
+
+Makefile.local config.h: configure $(TESTSRCS)
+ @echo "$@ is out of date; please run ./configure"
+ @exit 1
+
- libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
- ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
++libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
++ $(AR) rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+
+mandoc: $(MAIN_OBJS) libmandoc.a
+ $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
+
++man: mandoc
++ $(LN) mandoc man
++
+man.cgi: $(CGI_OBJS) libmandoc.a
+ $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
+
+mandocd: $(MANDOCD_OBJS) libmandoc.a
+ $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD)
+
+catman: catman.o libmandoc.a
+ $(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD)
+
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+ $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
+
- soelim: $(SOELIM_OBJS)
- $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
++soelim: $(SOELIM_COBJS) soelim.o
++ $(CC) -o $@ $(LDFLAGS) $(SOELIM_COBJS) soelim.o
+
+# --- maintainer targets ---
+
+www-install: www
+ $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+ $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+ $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
+
+depend: config.h
- mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
++ ./configure -depend
++ mkdep -f Makefile.tmp1 $(CFLAGS) $(SRCS)
+ perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
+ s|\\\n||g; s| +| |g; s| $$||mg; print;' \
- Makefile.depend > Makefile.tmp
- mv Makefile.tmp Makefile.depend
++ Makefile.tmp1 > Makefile.tmp2
++ rm Makefile.tmp1
++ mv Makefile.tmp2 Makefile.depend
+
+regress-distclean:
+ @find regress \
+ -name '.#*' -o \
+ -name '*.orig' -o \
+ -name '*.rej' -o \
+ -name '*.core' \
+ -exec rm -i {} \;
+
+regress-distcheck:
+ @find regress ! -type d ! -type f
+ @find regress -type f \
+ ! -path '*/CVS/*' \
+ ! -name Makefile \
+ ! -name Makefile.inc \
+ ! -name '*.in' \
+ ! -name '*.out_ascii' \
+ ! -name '*.out_utf8' \
+ ! -name '*.out_html' \
+ ! -name '*.out_markdown' \
+ ! -name '*.out_lint' \
+ ! -path regress/regress.pl \
+ ! -path regress/regress.pl.1
+
+dist: mandoc-$(VERSION).sha256
+
+mandoc-$(VERSION).sha256: mandoc-$(VERSION).tar.gz
+ sha256 mandoc-$(VERSION).tar.gz > $@
+
+mandoc-$(VERSION).tar.gz: $(DISTFILES)
+ ls regress/*/*/*.mandoc_* && exit 1 || true
+ mkdir -p .dist/mandoc-$(VERSION)/
+ $(INSTALL) -m 0644 $(DISTFILES) .dist/mandoc-$(VERSION)
+ cp -pR regress .dist/mandoc-$(VERSION)
+ find .dist/mandoc-$(VERSION)/regress \
+ -type d -name CVS -print0 | xargs -0 rm -rf
+ chmod 755 .dist/mandoc-$(VERSION)/configure
+ ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
+ rm -rf .dist/
+
+dist-install: dist
+ $(INSTALL_DATA) mandoc-$(VERSION).tar.gz mandoc-$(VERSION).sha256 \
+ $(HTDOCDIR)/snapshots
+
+# === SUFFIX RULES =====================================================
+
+.SUFFIXES: .1 .3 .5 .7 .8 .h
+.SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html
+
+.h.h.html:
+ highlight -I $< > $@
+
- .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
- mandoc -Thtml -Wwarning,stop \
++.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
++ ./mandoc -Thtml -Wwarning,stop \
+ -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \
+ $< > $@
diff --cc contrib/mandoc/compat_mkstemps.c
index 000000000000,32394ffa682e..32394ffa682e
mode 000000,100644..100644
--- a/contrib/mandoc/compat_mkstemps.c
+++ b/contrib/mandoc/compat_mkstemps.c
diff --cc contrib/mandoc/config.h
index 36ff8a880eba,000000000000..553c4c8b7400
mode 100644,000000..100644
--- a/contrib/mandoc/config.h
+++ b/contrib/mandoc/config.h
@@@ -1,55 -1,0 +1,53 @@@
+#ifdef __cplusplus
+#error "Do not use C++. See the INSTALL file."
+#endif
+
- #if !defined(__GNUC__) || (__GNUC__ < 4)
- #define __attribute__(x)
- #endif
-
+#include <sys/types.h>
+
+#define MAN_CONF_FILE "/etc/man.conf"
+#define MANPATH_BASE "/usr/share/man"
+#define MANPATH_DEFAULT "/usr/share/man:/usr/local/man"
+#define OSENUM MANDOC_OS_OTHER
+#define UTF8_LOCALE "en_US.UTF-8"
- #define HAVE_CMSG_XPG42 0
+#define HAVE_DIRENT_NAMLEN 1
+#define HAVE_ENDIAN 0
+#define HAVE_ERR 1
+#define HAVE_FTS 1
+#define HAVE_FTS_COMPARE_CONST 1
+#define HAVE_GETLINE 1
+#define HAVE_GETSUBOPT 1
+#define HAVE_ISBLANK 1
+#define HAVE_LESS_T 1
+#define HAVE_MKDTEMP 1
++#define HAVE_MKSTEMPS 1
+#define HAVE_NTOHL 1
+#define HAVE_PLEDGE 0
+#define HAVE_PROGNAME 1
+#define HAVE_REALLOCARRAY 1
+#define HAVE_RECALLOCARRAY 0
+#define HAVE_REWB_BSD 1
+#define HAVE_REWB_SYSV 1
+#define HAVE_SANDBOX_INIT 0
+#define HAVE_STRCASESTR 1
+#define HAVE_STRINGLIST 1
+#define HAVE_STRLCAT 1
+#define HAVE_STRLCPY 1
+#define HAVE_STRNDUP 1
+#define HAVE_STRPTIME 1
+#define HAVE_STRSEP 1
+#define HAVE_STRTONUM 1
+#define HAVE_SYS_ENDIAN 1
+#define HAVE_VASPRINTF 1
+#define HAVE_WCHAR 1
+#define HAVE_OHASH 1
++#define NEED_XPG4_2 0
+
+#define BINM_APROPOS "apropos"
+#define BINM_CATMAN "catman"
+#define BINM_MAKEWHATIS "makewhatis"
+#define BINM_MAN "man"
+#define BINM_SOELIM "soelim"
+#define BINM_WHATIS "whatis"
++#define BINM_PAGER "less"
+
+extern void *recallocarray(void *, size_t, size_t, size_t);
diff --cc contrib/mandoc/main.c
index 14a3691bfc59,000000000000..3c0255387c71
mode 100644,000000..100644
--- a/contrib/mandoc/main.c
+++ b/contrib/mandoc/main.c
@@@ -1,1282 -1,0 +1,1405 @@@
- /* $Id: main.c,v 1.332 2019/07/19 20:27:25 schwarze Exp $ */
++/* $Id: main.c,v 1.358 2021/09/04 22:38:46 schwarze Exp $ */
+/*
++ * Copyright (c) 2010-2012, 2014-2021 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Main program for mandoc(1), man(1), apropos(1), whatis(1), and help(1).
+ */
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/param.h> /* MACHINE */
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <ctype.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <glob.h>
++#include <limits.h>
+#if HAVE_SANDBOX_INIT
+#include <sandbox.h>
+#endif
+#include <signal.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "mandoc_xr.h"
+#include "roff.h"
+#include "mdoc.h"
+#include "man.h"
+#include "mandoc_parse.h"
+#include "tag.h"
++#include "term_tag.h"
+#include "main.h"
+#include "manconf.h"
+#include "mansearch.h"
+
+enum outmode {
+ OUTMODE_DEF = 0,
+ OUTMODE_FLN,
+ OUTMODE_LST,
+ OUTMODE_ALL,
+ OUTMODE_ONE
+};
+
+enum outt {
+ OUTT_ASCII = 0, /* -Tascii */
+ OUTT_LOCALE, /* -Tlocale */
+ OUTT_UTF8, /* -Tutf8 */
+ OUTT_TREE, /* -Ttree */
+ OUTT_MAN, /* -Tman */
+ OUTT_HTML, /* -Thtml */
+ OUTT_MARKDOWN, /* -Tmarkdown */
+ OUTT_LINT, /* -Tlint */
+ OUTT_PS, /* -Tps */
+ OUTT_PDF /* -Tpdf */
+};
+
- struct curparse {
- struct mparse *mp;
- struct manoutput *outopts; /* output options */
++struct outstate {
++ struct tag_files *tag_files; /* Tagging state variables. */
+ void *outdata; /* data for output */
- char *os_s; /* operating system for display */
++ int use_pager;
+ int wstop; /* stop after a file with a warning */
- enum mandoc_os os_e; /* check base system conventions */
++ int had_output; /* Some output was generated. */
+ enum outt outtype; /* which output to use */
+};
+
+
+int mandocdb(int, char *[]);
+
- static void check_xr(void);
- static int fs_lookup(const struct manpaths *,
- size_t ipath, const char *,
- const char *, const char *,
++static void check_xr(struct manpaths *);
++static void fs_append(char **, size_t, int,
++ size_t, const char *, enum form,
++ struct manpage **, size_t *);
++static int fs_lookup(const struct manpaths *, size_t,
++ const char *, const char *, const char *,
+ struct manpage **, size_t *);
+static int fs_search(const struct mansearch *,
- const struct manpaths *, int, char**,
++ const struct manpaths *, const char *,
+ struct manpage **, size_t *);
- static void outdata_alloc(struct curparse *);
- static void parse(struct curparse *, int, const char *);
++static void glob_esc(char **, const char *, const char *);
++static void outdata_alloc(struct outstate *, struct manoutput *);
++static void parse(struct mparse *, int, const char *,
++ struct outstate *, struct manconf *);
+static void passthrough(int, int);
- static pid_t spawn_pager(struct tag_files *);
++static void process_onefile(struct mparse *, struct manpage *,
++ int, struct outstate *, struct manconf *);
++static void run_pager(struct outstate *, char *);
++static pid_t spawn_pager(struct outstate *, char *);
+static void usage(enum argmode) __attribute__((__noreturn__));
- static int woptions(struct curparse *, char *);
++static int woptions(char *, enum mandoc_os *, int *);
+
+static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
+static char help_arg[] = "help";
+static char *help_argv[] = {help_arg, NULL};
+
+
+int
+main(int argc, char *argv[])
+{
- struct manconf conf;
- struct mansearch search;
- struct curparse curp;
- struct winsize ws;
- struct tag_files *tag_files;
*** 1811 LINES SKIPPED ***