Permalink
Browse files

8297 update mdocml to 1.14.1

Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
  • Loading branch information...
yuripv authored and richlowe committed May 28, 2017
1 parent 299c9e7 commit a40ea1a7d80eee1b409e9dcc2e48c730988147ea
Showing with 7,454 additions and 2,584 deletions.
  1. +1 −67 exception_lists/cstyle
  2. +1 −20 exception_lists/hdrchk
  3. +8 −0 usr/src/cmd/mandoc/Makefile.common
  4. +3 −3 usr/src/cmd/mandoc/chars.c
  5. +36 −17 usr/src/cmd/mandoc/config.h
  6. +508 −0 usr/src/cmd/mandoc/dba.c
  7. +50 −0 usr/src/cmd/mandoc/dba.h
  8. +188 −0 usr/src/cmd/mandoc/dba_array.c
  9. +47 −0 usr/src/cmd/mandoc/dba_array.h
  10. +72 −0 usr/src/cmd/mandoc/dba_read.c
  11. +127 −0 usr/src/cmd/mandoc/dba_write.c
  12. +30 −0 usr/src/cmd/mandoc/dba_write.h
  13. +480 −0 usr/src/cmd/mandoc/dbm.c
  14. +68 −0 usr/src/cmd/mandoc/dbm.h
  15. +194 −0 usr/src/cmd/mandoc/dbm_map.c
  16. +29 −0 usr/src/cmd/mandoc/dbm_map.h
  17. +29 −35 usr/src/cmd/mandoc/eqn_html.c
  18. +8 −5 usr/src/cmd/mandoc/eqn_term.c
  19. +463 −270 usr/src/cmd/mandoc/html.c
  20. +14 −60 usr/src/cmd/mandoc/html.h
  21. +4 −6 usr/src/cmd/mandoc/libmandoc.h
  22. +2 −2 usr/src/cmd/mandoc/libmdoc.h
  23. +36 −45 usr/src/cmd/mandoc/main.c
  24. +1 −3 usr/src/cmd/mandoc/main.h
  25. +5 −5 usr/src/cmd/mandoc/man.c
  26. +3 −1 usr/src/cmd/mandoc/man_hash.c
  27. +187 −189 usr/src/cmd/mandoc/man_html.c
  28. +6 −6 usr/src/cmd/mandoc/man_macro.c
  29. +15 −11 usr/src/cmd/mandoc/man_term.c
  30. +2 −1 usr/src/cmd/mandoc/manconf.h
  31. +2 −1 usr/src/cmd/mandoc/mandoc.h
  32. +3 −2 usr/src/cmd/mandoc/mandoc_aux.h
  33. +2,316 −0 usr/src/cmd/mandoc/mandocdb.c
  34. +72 −81 usr/src/cmd/mandoc/manpath.c
  35. +751 −0 usr/src/cmd/mandoc/mansearch.c
  36. +14 −7 usr/src/cmd/mandoc/mansearch.h
  37. +42 −49 usr/src/cmd/mandoc/mdoc.c
  38. +3 −2 usr/src/cmd/mandoc/mdoc_argv.c
  39. +3 −1 usr/src/cmd/mandoc/mdoc_hash.c
  40. +398 −760 usr/src/cmd/mandoc/mdoc_html.c
  41. +90 −55 usr/src/cmd/mandoc/mdoc_macro.c
  42. +41 −156 usr/src/cmd/mandoc/mdoc_man.c
  43. +2 −2 usr/src/cmd/mandoc/mdoc_state.c
  44. +105 −218 usr/src/cmd/mandoc/mdoc_term.c
  45. +392 −235 usr/src/cmd/mandoc/mdoc_validate.c
  46. +7 −7 usr/src/cmd/mandoc/preconv.c
  47. +10 −16 usr/src/cmd/mandoc/read.c
  48. +27 −25 usr/src/cmd/mandoc/roff.c
  49. +13 −15 usr/src/cmd/mandoc/roff.h
  50. +58 −13 usr/src/cmd/mandoc/tag.c
  51. +11 −22 usr/src/cmd/mandoc/tbl_html.c
  52. +19 −5 usr/src/cmd/mandoc/term.c
  53. +2 −2 usr/src/cmd/mandoc/term_ascii.c
  54. +48 −62 usr/src/cmd/mandoc/term_ps.c
  55. +40 −10 usr/src/cmd/mandoc/tree.c
  56. +1 −1 usr/src/lib/libc/port/gen/fts.c
  57. +70 −21 usr/src/man/man1/mandoc.1
  58. +26 −2 usr/src/man/man5/mandoc_char.5
  59. +34 −17 usr/src/man/man5/mdoc.5
  60. +4 −1 usr/src/tools/mandoc/Makefile
  61. +128 −0 usr/src/tools/mandoc/fts.h
  62. +105 −50 usr/src/tools/scripts/webrev.sh
View
@@ -100,73 +100,7 @@ usr/src/cmd/krb5/ldap_util/kdb5_ldap_util.h
usr/src/cmd/krb5/slave/kprop.c
usr/src/cmd/krb5/slave/kprop.h
usr/src/cmd/krb5/slave/kpropd.c
usr/src/cmd/mandoc/att.c
usr/src/cmd/mandoc/chars.c
usr/src/cmd/mandoc/compat_ohash.c
usr/src/cmd/mandoc/compat_ohash.h
usr/src/cmd/mandoc/compat_reallocarray.c
usr/src/cmd/mandoc/compat_strtonum.c
usr/src/cmd/mandoc/config.h
usr/src/cmd/mandoc/eqn_html.c
usr/src/cmd/mandoc/eqn_term.c
usr/src/cmd/mandoc/eqn.c
usr/src/cmd/mandoc/html.c
usr/src/cmd/mandoc/html.h
usr/src/cmd/mandoc/lib.c
usr/src/cmd/mandoc/libman.h
usr/src/cmd/mandoc/libmandoc.h
usr/src/cmd/mandoc/libmdoc.h
usr/src/cmd/mandoc/libroff.h
usr/src/cmd/mandoc/main.c
usr/src/cmd/mandoc/main.h
usr/src/cmd/mandoc/man_hash.c
usr/src/cmd/mandoc/man_html.c
usr/src/cmd/mandoc/man_macro.c
usr/src/cmd/mandoc/man_term.c
usr/src/cmd/mandoc/man_validate.c
usr/src/cmd/mandoc/man.c
usr/src/cmd/mandoc/man.h
usr/src/cmd/mandoc/manconf.h
usr/src/cmd/mandoc/mandoc_aux.c
usr/src/cmd/mandoc/mandoc_aux.h
usr/src/cmd/mandoc/mandoc_ohash.c
usr/src/cmd/mandoc/mandoc_ohash.h
usr/src/cmd/mandoc/mandoc.c
usr/src/cmd/mandoc/mandoc.h
usr/src/cmd/mandoc/manpath.c
usr/src/cmd/mandoc/mansearch.h
usr/src/cmd/mandoc/mdoc_argv.c
usr/src/cmd/mandoc/mdoc_hash.c
usr/src/cmd/mandoc/mdoc_html.c
usr/src/cmd/mandoc/mdoc_macro.c
usr/src/cmd/mandoc/mdoc_man.c
usr/src/cmd/mandoc/mdoc_state.c
usr/src/cmd/mandoc/mdoc_term.c
usr/src/cmd/mandoc/mdoc_validate.c
usr/src/cmd/mandoc/mdoc.c
usr/src/cmd/mandoc/mdoc.h
usr/src/cmd/mandoc/msec.c
usr/src/cmd/mandoc/out.c
usr/src/cmd/mandoc/out.h
usr/src/cmd/mandoc/preconv.c
usr/src/cmd/mandoc/read.c
usr/src/cmd/mandoc/roff_int.h
usr/src/cmd/mandoc/roff.c
usr/src/cmd/mandoc/roff.h
usr/src/cmd/mandoc/st.c
usr/src/cmd/mandoc/tag.c
usr/src/cmd/mandoc/tag.h
usr/src/cmd/mandoc/tbl_data.c
usr/src/cmd/mandoc/tbl_html.c
usr/src/cmd/mandoc/tbl_layout.c
usr/src/cmd/mandoc/tbl_opts.c
usr/src/cmd/mandoc/tbl_term.c
usr/src/cmd/mandoc/tbl.c
usr/src/cmd/mandoc/term_ascii.c
usr/src/cmd/mandoc/term_ps.c
usr/src/cmd/mandoc/term.c
usr/src/cmd/mandoc/term.h
usr/src/cmd/mandoc/tree.c
usr/src/cmd/mandoc
usr/src/cmd/ttymon/sttyparse.c
usr/src/common/ficl/ficltokens.h
usr/src/common/bzip2/bzlib.h
View
@@ -36,26 +36,7 @@ usr/src/cmd/krb5/ldap_util/kdb5_ldap_services.h
usr/src/cmd/krb5/ldap_util/kdb5_ldap_util.h
usr/src/cmd/krb5/slave/kprop.h
usr/src/cmd/localedef/localedef.h
usr/src/cmd/mandoc/compat_ohash.h
usr/src/cmd/mandoc/config.h
usr/src/cmd/mandoc/html.h
usr/src/cmd/mandoc/libman.h
usr/src/cmd/mandoc/libmandoc.h
usr/src/cmd/mandoc/libmdoc.h
usr/src/cmd/mandoc/libroff.h
usr/src/cmd/mandoc/main.h
usr/src/cmd/mandoc/man.h
usr/src/cmd/mandoc/manconf.h
usr/src/cmd/mandoc/mandoc_aux.h
usr/src/cmd/mandoc/mandoc_ohash.h
usr/src/cmd/mandoc/mandoc.h
usr/src/cmd/mandoc/mansearch.h
usr/src/cmd/mandoc/mdoc.h
usr/src/cmd/mandoc/out.h
usr/src/cmd/mandoc/roff_int.h
usr/src/cmd/mandoc/roff.h
usr/src/cmd/mandoc/tag.h
usr/src/cmd/mandoc/term.h
usr/src/cmd/mandoc
usr/src/common/ficl/ficltokens.h
usr/src/grub/grub-0.97/stage2/shared.h
usr/src/lib/gss_mechs/mech_krb5/et/error_table.h
@@ -18,6 +18,12 @@ PROG= mandoc
OBJS= att.o \
chars.o \
dba.o \
dba_array.o \
dba_read.o \
dba_write.o \
dbm.o \
dbm_map.o \
eqn.o \
eqn_html.o \
eqn_term.o \
@@ -34,6 +40,8 @@ OBJS= att.o \
mandoc.o \
mandoc_aux.o \
mandoc_ohash.o \
mandocdb.o \
mansearch.o \
mdoc.o \
mdoc_argv.o \
mdoc_hash.o \
@@ -1,4 +1,4 @@
/* $Id: chars.c,v 1.68 2015/10/13 22:59:54 schwarze Exp $ */
/* $Id: chars.c,v 1.69 2017/02/17 18:28:06 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -101,8 +101,8 @@ static struct ln lines[] = {
{ "bq", ",", 0x201a },
{ "lq", "\"", 0x201c },
{ "rq", "\"", 0x201d },
{ "Lq", "``", 0x201c },
{ "Rq", "''", 0x201d },
{ "Lq", "\"", 0x201c },
{ "Rq", "\"", 0x201d },
{ "oq", "`", 0x2018 },
{ "cq", "\'", 0x2019 },
{ "aq", "\'", 0x0027 },
@@ -1,28 +1,47 @@
#ifndef MANDOC_CONFIG_H
#define MANDOC_CONFIG_H
#define MANDOC_CONFIG_H
#include <sys/types.h>
#include <stdio.h>
#define MAN_CONF_FILE "/etc/man.conf"
#define MANPATH_DEFAULT "/usr/share/man:/usr/gnu/share/man"
#define UTF8_LOCALE "en_US.UTF-8"
#define EFTYPE EINVAL
#define O_DIRECTORY 0
#define HAVE_CMSG_XPG42 0
#define HAVE_DIRENT_NAMLEN 0
#define HAVE_ENDIAN 1
#define HAVE_ERR 1
#define HAVE_MANPATH 1
#define HAVE_MMAP 1
#define HAVE_OHASH 0
#define HAVE_FTS 1
#define HAVE_FTS_COMPARE_CONST 0
#define HAVE_GETLINE 1
#define HAVE_GETSUBOPT 1
#define HAVE_ISBLANK 1
#define HAVE_MKDTEMP 1
#define HAVE_NTOHL 1
#define HAVE_OHASH 0
#define HAVE_PLEDGE 0
#define HAVE_PROGNAME 1
#define HAVE_REALLOCARRAY 0
#define HAVE_REALLOCARRAY 1
#define HAVE_REWB_BSD 1
#define HAVE_REWB_SYSV 1
#define HAVE_SANDBOX_INIT 0
#define HAVE_SQLITE3 0
#define HAVE_STRPTIME 1
#define HAVE_STRTONUM 0
#define HAVE_WCHAR 1
#define BINM_APROPOS "apropos"
#define BINM_MAN "man"
#define BINM_WHATIS "whatis"
#define BINM_MAKEWHATIS "man -w"
#define HAVE_STRCASESTR 1
#define HAVE_STRINGLIST 0
#define HAVE_STRLCAT 1
#define HAVE_STRLCPY 1
#define HAVE_STRPTIME 1
#define HAVE_STRSEP 1
#define HAVE_STRTONUM 1
#define HAVE_SYS_ENDIAN 0
#define HAVE_VASPRINTF 1
#define HAVE_WCHAR 1
extern void *reallocarray(void *, size_t, size_t);
extern long long strtonum(const char *, long long, long long, const char **);
#define BINM_APROPOS "apropos"
#define BINM_MAN "man"
#define BINM_WHATIS "whatis"
#define BINM_MAKEWHATIS "man -w"
#endif /* MANDOC_CONFIG_H */
Oops, something went wrong.

0 comments on commit a40ea1a

Please sign in to comment.