Permalink
Browse files

7243 update mdocml to 1.13.4

Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
  • Loading branch information...
yuripv authored and richlowe committed Jul 29, 2016
1 parent 7a8b8fd commit 371584c2eae4cf827fd406ba26c14f021adaaa70
Showing with 5,906 additions and 5,760 deletions.
  1. +22 −10 exception_lists/cstyle
  2. +7 −2 exception_lists/hdrchk
  3. +8 −2 usr/src/cmd/mandoc/Makefile.common
  4. +4 −15 usr/src/cmd/mandoc/THIRDPARTYLICENSE
  5. +3 −2 usr/src/cmd/mandoc/att.c
  6. +407 −88 usr/src/cmd/mandoc/chars.c
  7. +0 −404 usr/src/cmd/mandoc/chars.in
  8. +0 −94 usr/src/cmd/mandoc/compat_fgetln.c
  9. +339 −0 usr/src/cmd/mandoc/compat_ohash.c
  10. +72 −0 usr/src/cmd/mandoc/compat_ohash.h
  11. +8 −38 usr/src/cmd/mandoc/config.h
  12. +23 −22 usr/src/cmd/mandoc/eqn.c
  13. +23 −54 usr/src/cmd/mandoc/html.c
  14. +1 −5 usr/src/cmd/mandoc/html.h
  15. +3 −2 usr/src/cmd/mandoc/lib.c
  16. +14 −49 usr/src/cmd/mandoc/libman.h
  17. +16 −27 usr/src/cmd/mandoc/libmandoc.h
  18. +24 −65 usr/src/cmd/mandoc/libmdoc.h
  19. +1 −4 usr/src/cmd/mandoc/libroff.h
  20. +346 −257 usr/src/cmd/mandoc/main.c
  21. +21 −26 usr/src/cmd/mandoc/main.h
  22. +91 −408 usr/src/cmd/mandoc/man.c
  23. +47 −97 usr/src/cmd/mandoc/man.h
  24. +14 −15 usr/src/cmd/mandoc/man_hash.c
  25. +79 −85 usr/src/cmd/mandoc/man_html.c
  26. +100 −198 usr/src/cmd/mandoc/man_macro.c
  27. +158 −133 usr/src/cmd/mandoc/man_term.c
  28. +72 −91 usr/src/cmd/mandoc/man_validate.c
  29. +48 −0 usr/src/cmd/mandoc/manconf.h
  30. +62 −71 usr/src/cmd/mandoc/mandoc.c
  31. +13 −22 usr/src/cmd/mandoc/mandoc.h
  32. +24 −32 usr/src/cmd/mandoc/mandoc_aux.c
  33. +1 −5 usr/src/cmd/mandoc/mandoc_aux.h
  34. +63 −0 usr/src/cmd/mandoc/mandoc_ohash.c
  35. +23 −0 usr/src/cmd/mandoc/mandoc_ohash.h
  36. +157 −59 usr/src/cmd/mandoc/manpath.c
  37. +1 −4 usr/src/cmd/mandoc/mansearch.h
  38. +92 −502 usr/src/cmd/mandoc/mdoc.c
  39. +130 −241 usr/src/cmd/mandoc/mdoc.h
  40. +100 −114 usr/src/cmd/mandoc/mdoc_argv.c
  41. +13 −12 usr/src/cmd/mandoc/mdoc_hash.c
  42. +196 −270 usr/src/cmd/mandoc/mdoc_html.c
  43. +248 −243 usr/src/cmd/mandoc/mdoc_macro.c
  44. +145 −165 usr/src/cmd/mandoc/mdoc_man.c
  45. +292 −0 usr/src/cmd/mandoc/mdoc_state.c
  46. +262 −278 usr/src/cmd/mandoc/mdoc_term.c
  47. +505 −634 usr/src/cmd/mandoc/mdoc_validate.c
  48. +2 −2 usr/src/cmd/mandoc/msec.c
  49. +4 −9 usr/src/cmd/mandoc/out.c
  50. +1 −4 usr/src/cmd/mandoc/out.h
  51. +10 −10 usr/src/cmd/mandoc/preconv.c
  52. +110 −190 usr/src/cmd/mandoc/read.c
  53. +593 −192 usr/src/cmd/mandoc/roff.c
  54. +164 −0 usr/src/cmd/mandoc/roff.h
  55. +41 −0 usr/src/cmd/mandoc/roff_int.h
  56. +3 −2 usr/src/cmd/mandoc/st.c
  57. +204 −0 usr/src/cmd/mandoc/tag.c
  58. +13 −16 usr/src/cmd/mandoc/{manpath.h → tag.h}
  59. +9 −9 usr/src/cmd/mandoc/tbl.c
  60. +7 −6 usr/src/cmd/mandoc/tbl_data.c
  61. +4 −4 usr/src/cmd/mandoc/tbl_html.c
  62. +3 −6 usr/src/cmd/mandoc/tbl_layout.c
  63. +1 −2 usr/src/cmd/mandoc/tbl_opts.c
  64. +3 −9 usr/src/cmd/mandoc/tbl_term.c
  65. +58 −70 usr/src/cmd/mandoc/term.c
  66. +25 −25 usr/src/cmd/mandoc/term.h
  67. +65 −91 usr/src/cmd/mandoc/term_ascii.c
  68. +28 −44 usr/src/cmd/mandoc/term_ps.c
  69. +65 −63 usr/src/cmd/mandoc/tree.c
  70. +101 −65 usr/src/man/man1/mandoc.1
  71. +1 −1 usr/src/man/man3c/ffs.3c
  72. +1 −1 usr/src/man/man4/ike.config.4
  73. +1 −18 usr/src/man/man4/rcmscript.4
  74. +5 −5 usr/src/man/man5/eqn.5
  75. +66 −48 usr/src/man/man5/mandoc_char.5
  76. +21 −13 usr/src/man/man5/mandoc_roff.5
  77. +19 −10 usr/src/man/man5/mdoc.5
View
@@ -81,12 +81,14 @@ 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_fgetln.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.c
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
@@ -96,43 +98,53 @@ 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.c
usr/src/cmd/mandoc/man.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/mandoc_aux.c
usr/src/cmd/mandoc/manpath.c
usr/src/cmd/mandoc/mdoc.c
usr/src/cmd/mandoc/mdoc.h
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/tbl.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/term.c
usr/src/cmd/mandoc/term.h
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/common/bzip2/bzlib.h
usr/src/common/bzip2/crctable.c
View
@@ -31,6 +31,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
@@ -39,12 +40,16 @@ 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/mandoc.h
usr/src/cmd/mandoc/manconf.h
usr/src/cmd/mandoc/mandoc_aux.h
usr/src/cmd/mandoc/manpath.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/grub/grub-0.97/stage2/shared.h
usr/src/lib/gss_mechs/mech_krb5/et/error_table.h
@@ -11,7 +11,7 @@
#
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
#
PROG= mandoc
@@ -33,12 +33,14 @@ OBJS= att.o \
man_validate.o \
mandoc.o \
mandoc_aux.o \
mandoc_ohash.o \
mdoc.o \
mdoc_argv.o \
mdoc_hash.o \
mdoc_html.o \
mdoc_macro.o \
mdoc_man.o \
mdoc_state.o \
mdoc_term.o \
mdoc_validate.o \
msec.o \
@@ -47,6 +49,7 @@ OBJS= att.o \
roff.o \
preconv.o \
st.o \
tag.o \
tbl.o \
tbl_data.o \
tbl_html.o \
@@ -58,10 +61,13 @@ OBJS= att.o \
term_ps.o \
tree.o
OBJS += compat_fgetln.o \
OBJS += compat_ohash.o \
compat_reallocarray.o \
compat_strtonum.o
CFLAGS += $(CC_VERBOSE)
C99MODE = $(C99_ENABLE)
CPPFLAGS += -DOSNAME="\"illumos\""
LDLIBS += -lz
@@ -1,17 +1,19 @@
$Id: LICENSE,v 1.7 2015/02/16 14:56:22 schwarze Exp $
$Id: LICENSE,v 1.12 2016/07/07 23:46:36 schwarze Exp $
With the exceptions noted below, all code and documentation
contained in the mdocml toolkit is protected by the Copyright
of the following developers:
Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org>
Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger <joerg@netbsd.org>
Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
Copyright (c) 1998, 2004, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
Copyright (c) 2004 Ted Unangst <tedu@openbsd.org>
Copyright (c) 1994 Christos Zoulas <christos@netbsd.org>
Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>
See the individual source files for information about who contributed
@@ -32,16 +34,3 @@ 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.
The following files included from outside sources are protected by
other people's Copyright and are distributed under a 3-clause BSD
license; see these individual files for details.
compat_fts.c, compat_fts.h,
compat_getsubopt.c, compat_strcasestr.c, compat_strsep.c,
man.1:
Copyright (c) 1989,1990,1993,1994 The Regents of the University of California
compat_fgetln.c:
Copyright (c) 1998 The NetBSD Foundation, Inc.
View
@@ -1,4 +1,4 @@
/* $Id: att.c,v 1.13 2014/11/28 18:57:31 schwarze Exp $ */
/* $Id: att.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <string.h>
#include "roff.h"
#include "mdoc.h"
#include "libmdoc.h"
@@ -45,5 +46,5 @@ mdoc_a2att(const char *p)
LINE("V.3", "AT&T System\\~V Release\\~3 UNIX");
LINE("V.4", "AT&T System\\~V Release\\~4 UNIX");
return(NULL);
return NULL;
}
Oops, something went wrong.

0 comments on commit 371584c

Please sign in to comment.