From 24dec0b179f6eba6d055b33faf478d202bfb11ba Mon Sep 17 00:00:00 2001 From: phil Date: Mon, 7 Aug 2017 17:23:44 +0000 Subject: Import libxo-0.8.4 from HEAD into stable/11 Submitted by: phil --- contrib/libxo/Makefile.am | 42 +- contrib/libxo/configure.ac | 25 +- contrib/libxo/doc/Makefile.am | 4 +- contrib/libxo/doc/libxo-manual.html | 2978 +++++++++++---------- contrib/libxo/doc/libxo.txt | 238 +- contrib/libxo/encoder/cbor/enc_cbor.c | 2 +- contrib/libxo/encoder/test/enc_test.c | 4 +- contrib/libxo/libxo/Makefile.am | 7 +- contrib/libxo/libxo/libxo.3 | 10 + contrib/libxo/libxo/libxo.c | 1253 +++++---- contrib/libxo/libxo/xo.h | 111 +- contrib/libxo/libxo/xo_attr.3 | 10 + contrib/libxo/libxo/xo_buf.h | 12 +- contrib/libxo/libxo/xo_create.3 | 10 + contrib/libxo/libxo/xo_emit.3 | 10 + contrib/libxo/libxo/xo_emit_err.3 | 10 + contrib/libxo/libxo/xo_emit_f.3 | 10 + contrib/libxo/libxo/xo_encoder.c | 10 +- contrib/libxo/libxo/xo_encoder.h | 5 +- contrib/libxo/libxo/xo_err.3 | 10 + contrib/libxo/libxo/xo_error.3 | 10 + contrib/libxo/libxo/xo_finish.3 | 10 + contrib/libxo/libxo/xo_flush.3 | 10 + contrib/libxo/libxo/xo_format.5 | 12 +- contrib/libxo/libxo/xo_message.3 | 10 + contrib/libxo/libxo/xo_no_setlocale.3 | 10 + contrib/libxo/libxo/xo_open_container.3 | 10 + contrib/libxo/libxo/xo_open_list.3 | 10 + contrib/libxo/libxo/xo_open_marker.3 | 10 + contrib/libxo/libxo/xo_options.7 | 156 ++ contrib/libxo/libxo/xo_parse_args.3 | 10 + contrib/libxo/libxo/xo_set_allocator.3 | 10 + contrib/libxo/libxo/xo_set_flags.3 | 10 + contrib/libxo/libxo/xo_set_info.3 | 10 + contrib/libxo/libxo/xo_set_options.3 | 10 + contrib/libxo/libxo/xo_set_style.3 | 10 + contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 | 10 + contrib/libxo/libxo/xo_set_version.3 | 10 + contrib/libxo/libxo/xo_set_writer.3 | 10 + contrib/libxo/libxo/xo_syslog.3 | 10 + contrib/libxo/libxo/xo_syslog.c | 19 +- contrib/libxo/tests/core/Makefile.am | 18 +- contrib/libxo/tests/core/saved/test_01.E.out | 286 +- contrib/libxo/tests/core/saved/test_01.H.out | 4 +- contrib/libxo/tests/core/saved/test_01.HIPx.out | 30 + contrib/libxo/tests/core/saved/test_01.HP.out | 30 + contrib/libxo/tests/core/saved/test_01.J.out | 2 +- contrib/libxo/tests/core/saved/test_01.JP.out | 12 + contrib/libxo/tests/core/saved/test_01.T.out | 5 + contrib/libxo/tests/core/saved/test_01.X.out | 2 +- contrib/libxo/tests/core/saved/test_01.XP.out | 12 + contrib/libxo/tests/core/saved/test_02.E.out | 136 +- contrib/libxo/tests/core/saved/test_02.J.out | 2 +- contrib/libxo/tests/core/saved/test_02.JP.out | 4 +- contrib/libxo/tests/core/saved/test_02.X.out | 2 +- contrib/libxo/tests/core/saved/test_02.XP.out | 2 +- contrib/libxo/tests/core/saved/test_03.E.out | 68 +- contrib/libxo/tests/core/saved/test_04.E.out | 44 +- contrib/libxo/tests/core/saved/test_05.E.out | 192 +- contrib/libxo/tests/core/saved/test_06.E.out | 44 +- contrib/libxo/tests/core/saved/test_07.E.out | 152 +- contrib/libxo/tests/core/saved/test_08.E.out | 372 +-- contrib/libxo/tests/core/saved/test_09.E.out | 80 +- contrib/libxo/tests/core/saved/test_10.E.out | 252 +- contrib/libxo/tests/core/saved/test_10.X.out | 2 +- contrib/libxo/tests/core/saved/test_10.XP.out | 2 +- contrib/libxo/tests/core/saved/test_11.E.out | 16 +- contrib/libxo/tests/core/saved/test_11.HIPx.out | 8 +- contrib/libxo/tests/core/saved/test_11.X.out | 2 +- contrib/libxo/tests/core/saved/test_11.XP.out | 2 +- contrib/libxo/tests/core/saved/test_12.E.out | 180 +- contrib/libxo/tests/core/saved/test_12.H.out | 2 +- contrib/libxo/tests/core/saved/test_12.HIPx.out | 89 +- contrib/libxo/tests/core/saved/test_12.HP.out | 89 +- contrib/libxo/tests/core/saved/test_12.J.out | 2 +- contrib/libxo/tests/core/saved/test_12.JP.out | 2 + contrib/libxo/tests/core/saved/test_12.T.out | 42 +- contrib/libxo/tests/core/saved/test_12.X.out | 2 +- contrib/libxo/tests/core/saved/test_12.XP.out | 2 + contrib/libxo/tests/core/test_01.c | 12 + contrib/libxo/tests/core/test_12.c | 11 + contrib/libxo/tests/gettext/Makefile.am | 3 +- contrib/libxo/tests/gettext/saved/gt_01.J.out | 2 +- contrib/libxo/tests/gettext/saved/gt_01.JP.out | 2 +- contrib/libxo/tests/xo/Makefile.am | 3 +- contrib/libxo/tests/xo/saved/xo_01.H.out | 2 +- contrib/libxo/tests/xo/saved/xo_01.HIPx.out | 24 + contrib/libxo/tests/xo/saved/xo_01.HP.out | 24 + contrib/libxo/tests/xo/saved/xo_01.J.out | 2 +- contrib/libxo/tests/xo/saved/xo_01.JP.out | 16 + contrib/libxo/tests/xo/saved/xo_01.T.out | 4 + contrib/libxo/tests/xo/saved/xo_01.X.out | 2 +- contrib/libxo/tests/xo/saved/xo_01.XP.out | 16 + contrib/libxo/tests/xo/xo_01.sh | 8 +- contrib/libxo/xo/xo.1 | 97 +- contrib/libxo/xo/xo.c | 4 +- contrib/libxo/xohtml/xohtml.1 | 24 +- contrib/libxo/xohtml/xohtml.css | 2 +- contrib/libxo/xohtml/xohtml.sh.in | 16 +- contrib/libxo/xolint/xolint.1 | 10 + contrib/libxo/xopo/xopo.1 | 26 +- contrib/libxo/xopo/xopo.c | 5 +- 102 files changed, 4494 insertions(+), 3142 deletions(-) create mode 100644 contrib/libxo/libxo/xo_options.7 (limited to 'contrib') diff --git a/contrib/libxo/Makefile.am b/contrib/libxo/Makefile.am index cb71d52..286bef9 100644 --- a/contrib/libxo/Makefile.am +++ b/contrib/libxo/Makefile.am @@ -38,7 +38,14 @@ GH_PAGES_DIR = gh-pages/ GH_PAGES_DIR_VER = gh-pages/${PACKAGE_VERSION} PACKAGE_FILE = ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz -upload: dist upload-docs +XOHTML_FILES = \ + ${top_srcdir}/xohtml/xohtml.css \ + ${top_srcdir}/xohtml/xohtml.js \ + ${top_srcdir}/xohtml/external/jquery.js \ + ${top_srcdir}/xohtml/external/jquery.qtip.css \ + ${top_srcdir}/xohtml/external/jquery.qtip.js + +upload: dist upload-docs upload-xohtml-files @echo "Remember to run:" @echo " gt tag ${PACKAGE_VERSION}" @@ -56,6 +63,18 @@ upload-docs: docs libxo-manual.html ${PACKAGE_VERSION} \ && git push origin gh-pages ) ; true +upload-xohtml-files: + @echo "Uploading xohtml files ... " + @-[ -d ${GH_PAGES_DIR} ] \ + && echo "Updating xohtml files on gh-pages ..." \ + && mkdir -p ${GH_PAGES_DIR_VER}/xohtml \ + && cp ${XOHTML_FILES} ${GH_PAGES_DIR_VER}/xohtml \ + && (cd ${GH_PAGES_DIR} \ + && git add ${PACKAGE_VERSION}/xohtml \ + && git commit -m 'new xohtml files' \ + ${PACKAGE_VERSION}/xohtml \ + && git push origin gh-pages ) ; true + pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA = packaging/${PACKAGE_NAME}.pc @@ -100,4 +119,25 @@ ANALYZE_DIR = ~/trash/libxo ANALYZE_CMD = scan-build-mp-3.6 analyze: + ${MAKE} clean ${ANALYZE_CMD} -o ${ANALYZE_DIR} ${MAKE} + +SANIFLAGS=-fno-omit-frame-pointer -g -O2 + +sanitize-address: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=address ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test + +sanitize-undefined: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=undefined ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test + +sanitize-memory: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=memory ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test diff --git a/contrib/libxo/configure.ac b/contrib/libxo/configure.ac index b47dedb..fab8c88 100644 --- a/contrib/libxo/configure.ac +++ b/contrib/libxo/configure.ac @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.6.3], [phil@juniper.net]) +AC_INIT([libxo], [0.8.4], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. @@ -20,7 +20,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -AM_PROG_AR AC_PROG_INSTALL AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LN_S @@ -135,6 +134,21 @@ if test "$GETTEXT_ENABLE" != "no"; then AC_MSG_RESULT([$HAVE_GETTEXT]) fi + + if test "$HAVE_GETTEXT" != "yes"; then + GETTEXT_PREFIX=/usr/local + AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}]) + + _save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl" + AC_LINK_IFELSE([AC_LANG_SOURCE([[#include ] + [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])], + [HAVE_GETTEXT=yes], + [HAVE_GETTEXT=no]) + CFLAGS="$_save_cflags" + + AC_MSG_RESULT([$HAVE_GETTEXT]) + fi fi if test "$HAVE_GETTEXT" = "yes"; then @@ -278,6 +292,13 @@ AC_ARG_ENABLE([debug], AC_MSG_RESULT([$LIBXO_DEBUG]) AM_CONDITIONAL([LIBXO_DEBUG], [test "$LIBXO_DEBUG" != "no"]) +AC_MSG_CHECKING([whether to use int return codes]) +AC_ARG_ENABLE([int-return-codes], + [ --enable-int-return-codes Use int return codes (instead of ssize_t)], + [USE_INT_RETURN_CODES=yes; AC_DEFINE([USE_INT_RETURN_CODES], [1], [Use int return codes])], + [USE_INT_RETURN_CODES=no]) +AC_MSG_RESULT([$USE_INT_RETURN_CODES]) + AC_MSG_CHECKING([whether to build with text-only rendering]) AC_ARG_ENABLE([text-only], [ --enable-text-only Turn on text-only rendering], diff --git a/contrib/libxo/doc/Makefile.am b/contrib/libxo/doc/Makefile.am index 16d6ba5..a00994c 100644 --- a/contrib/libxo/doc/Makefile.am +++ b/contrib/libxo/doc/Makefile.am @@ -61,9 +61,9 @@ xolint.txt: ${top_srcdir}/xolint/xolint.pl CLEANFILES = \ xolint.txt \ ${INPUT}.xml \ -${INPUT}.txt \ ${INPUT}.fxml \ -${INPUT}.html +${OUTPUT}.txt \ +${OUTPUT}.html else doc docs: @${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org" diff --git a/contrib/libxo/doc/libxo-manual.html b/contrib/libxo/doc/libxo-manual.html index 0c042a4..b56ddab 100644 --- a/contrib/libxo/doc/libxo-manual.html +++ b/contrib/libxo/doc/libxo-manual.html @@ -515,7 +515,7 @@ li.indline1 { } @top-right { - content: "May 2016"; + content: "August 2017"; } @top-center { @@ -21983,15 +21983,17 @@ jQuery(function ($) { - - - - - - - - - + + + + + + + + + + + @@ -22009,7 +22011,7 @@ jQuery(function ($) { -May 28, 2016 +August 3, 2017

libxo: The Easy Way to Generate text, XML, JSON, and HTML output
libxo-manual

@@ -22018,394 +22020,413 @@ jQuery(function ($) {