Add files using upload-large-folder tool

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/Dockerfile

@@ -0,0 +1,32 @@
+# The image is also used for libxslt, that's why we need git and
+# libgcrypt-dev.
+
+FROM ubuntu:24.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
+        curl git ca-certificates \
+        autoconf automake libtool pkg-config \
+        make gcc clang llvm libclang-rt-dev \
+        zlib1g-dev liblzma-dev libgcrypt-dev \
+        python3-dev \
+        cmake meson
+WORKDIR /tests
+RUN curl https://www.w3.org/XML/Test/xmlts20080827.tar.gz |tar xz
+
+# XML::LibXML uses Alien::Libxml2 which has a huge dependency chain.
+# We try to install most dependencies with apt. We also require
+# libxml2-dev to stop Alien::Libxml2 from downloading and building
+# libxml2 on its own.
+RUN apt-get install -y --no-install-recommends \
+        libperl-dev libxml2-dev cpanminus \
+        libalien-build-perl \
+        libio-socket-ssl-perl \
+        libsort-versions-perl \
+        liburi-perl \
+        libxml-namespacesupport-perl  \
+        libxml-sax-perl \
+        libyaml-perl
+RUN cpanm -n Alien::Libxml2
+RUN apt-get remove -y libxml2-dev

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/Test-Msvc.ps1

@@ -0,0 +1,49 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+if (-not (Test-Path cmake-$Env:CMAKE_VERSION-win64-x64)) {
+    Invoke-WebRequest `
+        -Uri http://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip `
+        -OutFile cmake-$Env:CMAKE_VERSION-win64-x64.zip
+    Expand-Archive cmake-$Env:CMAKE_VERSION-win64-x64.zip -DestinationPath .
+}
+$Env:Path="$Env:CI_PROJECT_DIR\cmake-$Env:CMAKE_VERSION-win64-x64\bin;$Env:Path"
+
+if (-not (Test-Path 7za.exe)) {
+    Invoke-WebRequest `
+        -Uri https://www.7-zip.org/a/7z1900-extra.7z `
+        -OutFile 7z1900-extra.7z
+    cmake -E tar xf 7z1900-extra.7z 7za.exe
+}
+
+if (-not (Test-Path libxml2-build/xmlconf)) {
+    Invoke-WebRequest `
+        -Uri https://www.w3.org/XML/Test/xmlts20080827.tar.gz `
+        -OutFile xmlts20080827.tar.gz ;
+    .\7za.exe x xmlts20080827.tar.gz -olibxml2-build
+}
+
+cmake `
+    -DBUILD_SHARED_LIBS="$Env:BUILD_SHARED_LIBS" `
+    -DCMAKE_INSTALL_PREFIX=libxml2-install `
+    -DLIBXML2_WITH_ICONV=OFF `
+    -DLIBXML2_WITH_LZMA=OFF `
+    -DLIBXML2_WITH_PYTHON=OFF `
+    -DLIBXML2_WITH_ZLIB=OFF `
+    -S . -B libxml2-build
+cmake --build libxml2-build --config Debug --target install
+cmake --build libxml2-build --config Release --target install
+New-Item -ItemType Directory libxml2-install\share\libxml2
+Copy-Item Copyright libxml2-install\share\libxml2
+
+cd libxml2-build
+ctest -C Debug -VV
+if ($LastExitCode -ne 0) {
+    throw "ctest failed"
+}
+ctest -C Release -VV
+if ($LastExitCode -ne 0) {
+    throw "ctest failed"
+}
+cd ..
+
+.\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:CMAKE_GENERATOR_TOOLSET-$Env:CMAKE_GENERATOR_PLATFORM-$Env:SUFFIX.7z .\libxml2-install\*

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/downstream-nokogiri.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+export LIBXML_DIR=$(pwd)
+export MAKEFLAGS=-j$(nproc)
+export NOCONFIGURE=1
+./autogen.sh
+
+git clone https://github.com/sparklemotion/nokogiri
+cd nokogiri
+bundle install
+bundle exec rake compile -- --with-xml2-source-dir=${LIBXML_DIR}
+bundle exec rake test

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/downstream-perl.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+sh autogen.sh --without-python
+make -j$(nproc)
+
+srcdir=$(pwd)
+incdir=$srcdir/include
+libdir=$srcdir/.libs
+
+curl -L https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0210.tar.gz |tar xz
+cd XML-LibXML-2.0210
+
+perl Makefile.PL INC="-I$incdir" LIBS="-L$libdir -lxml2"
+make
+# Known to fail
+LD_LIBRARY_PATH=$libdir make test || true

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/llvm-symbolizer

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Newer versions of llvm-symbolizer require libxml2 themselves. Running
+# a test program with LD_LIBRARY_PATH set to .libs makes llvm-symbolizer
+# pick up the tested development version of libxml2 which breaks
+# completely if the build is instrumented with ASan. This wrapper script
+# invokes llvm-symbolizer with an empty LD_LIBRARY_PATH.
+
+LD_LIBRARY_PATH='' llvm-symbolizer "$@"

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/setup_mingw.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pacman --noconfirm -Syu
+
+prefix=
+if [ -n "$MINGW_PACKAGE_PREFIX" ]; then
+    prefix="${MINGW_PACKAGE_PREFIX}-"
+fi
+for module in libiconv python xz zlib "$@"; do
+    pacman --noconfirm -S --needed ${prefix}$module
+done
+
+if [ ! -e libxml2-build/xmlconf ]; then
+    mkdir -p libxml2-build
+    wget https://www.w3.org/XML/Test/xmlts20080827.tar -O - |
+       tar -x -C libxml2-build
+fi

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/test.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+cd libxml2-build
+sh ../autogen.sh $BASE_CONFIG $CONFIG || cat config.log
+make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror"
+make CFLAGS="$CFLAGS -Werror" check

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/test_cmake.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+CFLAGS="-Werror $CFLAGS" \
+cmake "$@" \
+    -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
+    -DCMAKE_INSTALL_PREFIX=libxml2-install \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -S . -B libxml2-build
+cmake --build libxml2-build --target install
+
+(cd libxml2-build && ctest -VV)
+
+mkdir -p libxml2-install/share/libxml2
+cp Copyright libxml2-install/share/libxml2
+(cd libxml2-install &&
+    tar -czf ../libxml2-$CI_COMMIT_SHORT_SHA-$SUFFIX.tar.gz *)

local-test-libxml2-delta-01/afc-libxml2/.gitlab-ci/test_meson.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# compile with the following warnings:
+# --warnlevel 3     : passes to the compiler -Wall -Wextra -Wpedantic
+# --werror          : passes to the compiler -Werror
+# --default-library : can be 'shared', 'static' or 'both'
+meson  setup \
+       --warnlevel 3 \
+       --werror \
+       --buildtype=debugoptimized \
+       --default-library shared \
+       -Dlegacy=enabled \
+       builddir
+
+ninja -C builddir test
+

local-test-libxml2-delta-01/afc-libxml2/doc/Makefile.am

@@ -0,0 +1,28 @@
+## Process this file with automake to produce Makefile.in
+SUBDIRS = . devhelp
+
+nobase_dist_doc_DATA = \
+	xmlcatalog.html \
+	xmllint.html
+
+dist_man_MANS = xml2-config.1 xmllint.1 xmlcatalog.1
+
+EXTRA_DIST = \
+	apibuild.py \
+	libxml2-api.xml \
+	xmlcatalog.xml \
+	xmllint.xml \
+	meson.build
+
+DOCBOOK_HTML = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+
+rebuild:
+	cd $(srcdir) && ./apibuild.py
+	cd $(srcdir) && $(XSLTPROC) --nonet xmllint.xml
+	cd $(srcdir) && $(XSLTPROC) --nonet -o xmllint.html $(DOCBOOK_HTML) xmllint.xml
+	cd $(srcdir) && $(XSLTPROC) --nonet xmlcatalog.xml
+	cd $(srcdir) && $(XSLTPROC) --nonet -o xmlcatalog.html $(DOCBOOK_HTML) xmlcatalog.xml
+	cd devhelp && $(MAKE) rebuild
+	cd .. && $(MAKE) rebuild_testapi
+
+.PHONY: rebuild

local-test-libxml2-delta-01/afc-libxml2/doc/apibuild.py

@@ -0,0 +1,1928 @@
+#!/usr/bin/env python3
+#
+# This is the API builder, it parses the C sources and build the
+# API formal description in XML.
+#
+# See Copyright for the status of this software.
+#
+# daniel@veillard.com
+#
+import os, sys
+import string
+import glob
+
+debug=0
+#debugsym='ignorableWhitespaceSAXFunc'
+debugsym=None
+
+#
+# C parser analysis code
+#
+ignored_files = {
+  "config.h": "generated portability layer",
+  "libxml.h": "internal only",
+  "testModule.c": "test tool",
+  "testapi.c": "generated regression tests",
+  "runtest.c": "regression tests program",
+  "runsuite.c": "regression tests program",
+  "tst.c": "not part of the library",
+  "test.c": "not part of the library",
+  "testdso.c": "test for dynamid shared libraries",
+  "testrecurse.c": "test for entities recursions",
+  "timsort.h": "Internal header only for xpath.c 2.9.0",
+  "nanoftp.h": "empty",
+  "SAX.h": "empty",
+}
+
+ignored_words = {
+  "WINAPI": (0, "Windows keyword"),
+  "LIBXML_DLL_IMPORT": (0, "Special macro to flag external keywords"),
+  "XMLPUBVAR": (0, "Special macro for extern vars for win32"),
+  "XSLTPUBVAR": (0, "Special macro for extern vars for win32"),
+  "EXSLTPUBVAR": (0, "Special macro for extern vars for win32"),
+  "XMLPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "XSLTPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "EXSLTPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "XSLTCALL": (0, "Special macro for win32 calls"),
+  "EXSLTCALL": (0, "Special macro for win32 calls"),
+  "__declspec": (3, "Windows keyword"),
+  "__stdcall": (0, "Windows keyword"),
+  "ATTRIBUTE_UNUSED": (0, "macro keyword"),
+  "ATTRIBUTE_DESTRUCTOR": (0, "macro keyword"),
+  "LIBEXSLT_PUBLIC": (0, "macro keyword"),
+  "X_IN_Y": (5, "macro function builder"),
+  "ATTRIBUTE_ALLOC_SIZE": (3, "macro for gcc checking extension"),
+  "ATTRIBUTE_PRINTF": (5, "macro for gcc printf args checking extension"),
+  "LIBXML_ATTR_FORMAT": (5, "macro for gcc printf args checking extension"),
+  "LIBXML_ATTR_ALLOC_SIZE": (3, "macro for gcc checking extension"),
+  "ATTRIBUTE_NO_SANITIZE": (3, "macro keyword"),
+  "ATTRIBUTE_NO_SANITIZE_INTEGER": (0, "macro keyword"),
+  "XML_DEPRECATED": (0, "macro keyword"),
+  "XML_DEPRECATED_MEMBER": (0, "macro keyword"),
+  "XML_GLOBALS_ALLOC": (0, "macro keyword"),
+  "XML_GLOBALS_ERROR": (0, "macro keyword"),
+  "XML_GLOBALS_IO": (0, "macro keyword"),
+  "XML_GLOBALS_PARSER": (0, "macro keyword"),
+  "XML_GLOBALS_TREE": (0, "macro keyword"),
+  "XML_THREAD_LOCAL": (0, "macro keyword"),
+}
+
+def escape(raw):
+    raw = raw.replace('&', '&')
+    raw = raw.replace('<', '&lt;')
+    raw = raw.replace('>', '&gt;')
+    raw = raw.replace("'", '&apos;')
+    raw = raw.replace('"', '&quot;')
+    return raw
+
+class identifier:
+    def __init__(self, name, header=None, module=None, type=None, lineno = 0,
+                 info=None, extra=None, conditionals = None):
+        self.name = name
+        self.header = header
+        self.module = module
+        self.type = type
+        self.info = info
+        self.extra = extra
+        self.lineno = lineno
+        self.static = 0
+        if conditionals == None or len(conditionals) == 0:
+            self.conditionals = None
+        else:
+            self.conditionals = conditionals[:]
+        if self.name == debugsym:
+            print("=> define %s : %s" % (debugsym, (module, type, info,
+                                         extra, conditionals)))
+
+    def __repr__(self):
+        r = "%s %s:" % (self.type, self.name)
+        if self.static:
+            r = r + " static"
+        if self.module != None:
+            r = r + " from %s" % (self.module)
+        if self.info != None:
+            r = r + " " +  repr(self.info)
+        if self.extra != None:
+            r = r + " " + repr(self.extra)
+        if self.conditionals != None:
+            r = r + " " + repr(self.conditionals)
+        return r
+
+
+    def set_header(self, header):
+        self.header = header
+    def set_module(self, module):
+        self.module = module
+    def set_type(self, type):
+        self.type = type
+    def set_info(self, info):
+        self.info = info
+    def set_extra(self, extra):
+        self.extra = extra
+    def set_lineno(self, lineno):
+        self.lineno = lineno
+    def set_static(self, static):
+        self.static = static
+    def set_conditionals(self, conditionals):
+        if conditionals == None or len(conditionals) == 0:
+            self.conditionals = None
+        else:
+            self.conditionals = conditionals[:]
+
+    def get_name(self):
+        return self.name
+    def get_header(self):
+        return self.module
+    def get_module(self):
+        return self.module
+    def get_type(self):
+        return self.type
+    def get_info(self):
+        return self.info
+    def get_lineno(self):
+        return self.lineno
+    def get_extra(self):
+        return self.extra
+    def get_static(self):
+        return self.static
+    def get_conditionals(self):
+        return self.conditionals
+
+    def update(self, header, module, type = None, info = None, extra=None,
+               conditionals=None):
+        if self.name == debugsym:
+            print("=> update %s : %s" % (debugsym, (module, type, info,
+                                         extra, conditionals)))
+        if header != None and self.header == None:
+            self.set_header(module)
+        if module != None and (self.module == None or self.header == self.module):
+            self.set_module(module)
+        if type != None and self.type == None:
+            self.set_type(type)
+        if info != None:
+            self.set_info(info)
+        if extra != None:
+            self.set_extra(extra)
+        if conditionals != None:
+            self.set_conditionals(conditionals)
+
+class index:
+    def __init__(self, name = "noname"):
+        self.name = name
+        self.identifiers = {}
+        self.functions = {}
+        self.variables = {}
+        self.includes = {}
+        self.structs = {}
+        self.enums = {}
+        self.typedefs = {}
+        self.macros = {}
+        self.references = {}
+        self.info = {}
+
+    def add_ref(self, name, header, module, static, type, lineno, info=None, extra=None, conditionals = None):
+        if name[0:2] == '__':
+            return None
+        d = None
+        if name in self.identifiers:
+           d = self.identifiers[name]
+           d.update(header, module, type, info, extra, conditionals)
+        else:
+           d = identifier(name, header, module, type, lineno, info, extra, conditionals)
+           self.identifiers[name] = d
+
+        if d != None and static == 1:
+            d.set_static(1)
+
+        if d != None and name != None and type != None:
+            self.references[name] = d
+
+        if name == debugsym:
+            print("New ref: %s" % (d))
+
+        return d
+
+    def add(self, name, header, module, static, type, lineno, info=None, extra=None, conditionals = None):
+        if name[0:2] == '__':
+            return None
+        d = None
+        if name in self.identifiers:
+           d = self.identifiers[name]
+           d.update(header, module, type, info, extra, conditionals)
+        else:
+           d = identifier(name, header, module, type, lineno, info, extra, conditionals)
+           self.identifiers[name] = d
+
+        if d != None and static == 1:
+            d.set_static(1)
+
+        if d != None and name != None and type != None:
+            if type == "function":
+                self.functions[name] = d
+            elif type == "functype":
+                self.functions[name] = d
+            elif type == "variable":
+                self.variables[name] = d
+            elif type == "include":
+                self.includes[name] = d
+            elif type == "struct":
+                self.structs[name] = d
+            elif type == "enum":
+                self.enums[name] = d
+            elif type == "typedef":
+                self.typedefs[name] = d
+            elif type == "macro":
+                self.macros[name] = d
+            else:
+                print("Unable to register type ", type)
+
+        if name == debugsym:
+            print("New symbol: %s" % (d))
+
+        return d
+
+    def merge(self, idx):
+        for id in list(idx.functions.keys()):
+              #
+              # macro might be used to override functions or variables
+              # definitions
+              #
+             if id in self.macros:
+                 del self.macros[id]
+             if id in self.functions:
+                 print("function %s from %s redeclared in %s" % (
+                    id, self.functions[id].header, idx.functions[id].header))
+             else:
+                 self.functions[id] = idx.functions[id]
+                 self.identifiers[id] = idx.functions[id]
+        for id in list(idx.variables.keys()):
+              #
+              # macro might be used to override functions or variables
+              # definitions
+              #
+             if id in self.macros:
+                 del self.macros[id]
+             if id in self.variables:
+                 print("variable %s from %s redeclared in %s" % (
+                    id, self.variables[id].header, idx.variables[id].header))
+             else:
+                 self.variables[id] = idx.variables[id]
+                 self.identifiers[id] = idx.variables[id]
+        for id in list(idx.structs.keys()):
+             if id in self.structs:
+                 print("struct %s from %s redeclared in %s" % (
+                    id, self.structs[id].header, idx.structs[id].header))
+             else:
+                 self.structs[id] = idx.structs[id]
+                 self.identifiers[id] = idx.structs[id]
+        for id in list(idx.typedefs.keys()):
+             if id in self.typedefs:
+                 print("typedef %s from %s redeclared in %s" % (
+                    id, self.typedefs[id].header, idx.typedefs[id].header))
+             else:
+                 self.typedefs[id] = idx.typedefs[id]
+                 self.identifiers[id] = idx.typedefs[id]
+        for id in list(idx.macros.keys()):
+              #
+              # macro might be used to override functions or variables
+              # definitions
+              #
+             if id in self.variables:
+                 continue
+             if id in self.functions:
+                 continue
+             if id in self.enums:
+                 continue
+             if id in self.macros and id != 'XML_OP':
+                 print("macro %s from %s redeclared in %s" % (
+                    id, self.macros[id].header, idx.macros[id].header))
+             else:
+                 self.macros[id] = idx.macros[id]
+                 self.identifiers[id] = idx.macros[id]
+        for id in list(idx.enums.keys()):
+             if id in self.enums:
+                 print("enum %s from %s redeclared in %s" % (
+                    id, self.enums[id].header, idx.enums[id].header))
+             else:
+                 self.enums[id] = idx.enums[id]
+                 self.identifiers[id] = idx.enums[id]
+
+    def merge_public(self, idx):
+        for id in list(idx.functions.keys()):
+             if id in self.functions:
+                 # check that function condition agrees with header
+                 if idx.functions[id].conditionals != \
+                    self.functions[id].conditionals:
+                     print("Header condition differs from Function for %s:" \
+                        % id)
+                     print("  H: %s" % self.functions[id].conditionals)
+                     print("  C: %s" % idx.functions[id].conditionals)
+                 up = idx.functions[id]
+                 self.functions[id].update(None, up.module, up.type, up.info, up.extra)
+         #     else:
+         #         print "Function %s from %s is not declared in headers" % (
+         #                id, idx.functions[id].module)
+
+        for id in list(idx.variables.keys()):
+            if id in self.variables:
+                # check that variable condition agrees with header
+                # TODO: produces many false positives
+                #if idx.variables[id].conditionals != \
+                #   self.variables[id].conditionals:
+                #    print("Header condition differs from Variable for %s:" \
+                #       % id)
+                #    print("  H: %s" % self.variables[id].conditionals)
+                #    print("  C: %s" % idx.variables[id].conditionals)
+                up = idx.variables[id]
+                self.variables[id].update(None, up.module, up.type, up.info, up.extra)
+
+    def analyze_dict(self, type, dict):
+        count = 0
+        public = 0
+        for name in list(dict.keys()):
+            id = dict[name]
+            count = count + 1
+            if id.static == 0:
+                public = public + 1
+        if count != public:
+            print("  %d %s , %d public" % (count, type, public))
+        elif count != 0:
+            print("  %d public %s" % (count, type))
+
+
+    def analyze(self):
+        self.analyze_dict("functions", self.functions)
+        self.analyze_dict("variables", self.variables)
+        self.analyze_dict("structs", self.structs)
+        self.analyze_dict("typedefs", self.typedefs)
+        self.analyze_dict("macros", self.macros)
+
+class CLexer:
+    """A lexer for the C language, tokenize the input by reading and
+       analyzing it line by line"""
+    def __init__(self, input):
+        self.input = input
+        self.tokens = []
+        self.line = ""
+        self.lineno = 0
+
+    def getline(self):
+        line = ''
+        while line == '':
+            line = self.input.readline()
+            if not line:
+                return None
+            self.lineno = self.lineno + 1
+            line = line.lstrip()
+            line = line.rstrip()
+            if line == '':
+                continue
+            while line[-1] == '\\':
+                line = line[:-1]
+                n = self.input.readline()
+                self.lineno = self.lineno + 1
+                n = n.lstrip()
+                n = n.rstrip()
+                if not n:
+                    break
+                else:
+                    line = line + n
+        return line
+
+    def getlineno(self):
+        return self.lineno
+
+    def push(self, token):
+        self.tokens.insert(0, token);
+
+    def debug(self):
+        print("Last token: ", self.last)
+        print("Token queue: ", self.tokens)
+        print("Line %d end: " % (self.lineno), self.line)
+
+    def token(self):
+        while self.tokens == []:
+            if self.line == "":
+                line = self.getline()
+            else:
+                line = self.line
+                self.line = ""
+            if line == None:
+                return None
+
+            if line[0] == '#':
+                self.tokens = list(map((lambda x: ('preproc', x)),
+                                  line.split()))
+                break;
+            l = len(line)
+            if line[0] == '"' or line[0] == "'":
+                end = line[0]
+                line = line[1:]
+                found = 0
+                tok = ""
+                while found == 0:
+                    i = 0
+                    l = len(line)
+                    while i < l:
+                        if line[i] == end:
+                            self.line = line[i+1:]
+                            line = line[:i]
+                            l = i
+                            found = 1
+                            break
+                        if line[i] == '\\':
+                            i = i + 1
+                        i = i + 1
+                    tok = tok + line
+                    if found == 0:
+                        line = self.getline()
+                        if line == None:
+                            return None
+                self.last = ('string', tok)
+                return self.last
+
+            if l >= 2 and line[0] == '/' and line[1] == '*':
+                line = line[2:]
+                found = 0
+                tok = ""
+                while found == 0:
+                    i = 0
+                    l = len(line)
+                    while i < l:
+                        if line[i] == '*' and i+1 < l and line[i+1] == '/':
+                            self.line = line[i+2:]
+                            line = line[:i-1]
+                            l = i
+                            found = 1
+                            break
+                        i = i + 1
+                    if tok != "":
+                        tok = tok + "\n"
+                    tok = tok + line
+                    if found == 0:
+                        line = self.getline()
+                        if line == None:
+                            return None
+                self.last = ('comment', tok)
+                return self.last
+            if l >= 2 and line[0] == '/' and line[1] == '/':
+                line = line[2:]
+                self.last = ('comment', line)
+                return self.last
+            i = 0
+            while i < l:
+                if line[i] == '/' and i+1 < l and line[i+1] == '/':
+                    self.line = line[i:]
+                    line = line[:i]
+                    break
+                if line[i] == '/' and i+1 < l and line[i+1] == '*':
+                    self.line = line[i:]
+                    line = line[:i]
+                    break
+                if line[i] == '"' or line[i] == "'":
+                    self.line = line[i:]
+                    line = line[:i]
+                    break
+                i = i + 1
+            l = len(line)
+            i = 0
+            while i < l:
+                if line[i] == ' ' or line[i] == '\t':
+                    i = i + 1
+                    continue
+                o = ord(line[i])
+                if (o >= 97 and o <= 122) or (o >= 65 and o <= 90) or \
+                   (o >= 48 and o <= 57):
+                    s = i
+                    while i < l:
+                        o = ord(line[i])
+                        if (o >= 97 and o <= 122) or (o >= 65 and o <= 90) or \
+                           (o >= 48 and o <= 57) or \
+			   (" \t(){}:;,+-*/%&!|[]=><".find(line[i])) == -1:
+                            i = i + 1
+                        else:
+                            break
+                    self.tokens.append(('name', line[s:i]))
+                    continue
+                if "(){}:;,[]".find(line[i]) != -1:
+#                 if line[i] == '(' or line[i] == ')' or line[i] == '{' or \
+#                    line[i] == '}' or line[i] == ':' or line[i] == ';' or \
+#                    line[i] == ',' or line[i] == '[' or line[i] == ']':
+                    self.tokens.append(('sep', line[i]))
+                    i = i + 1
+                    continue
+                if "+-*><=/%&!|.".find(line[i]) != -1:
+#                 if line[i] == '+' or line[i] == '-' or line[i] == '*' or \
+#                    line[i] == '>' or line[i] == '<' or line[i] == '=' or \
+#                    line[i] == '/' or line[i] == '%' or line[i] == '&' or \
+#                    line[i] == '!' or line[i] == '|' or line[i] == '.':
+                    if line[i] == '.' and  i + 2 < l and \
+                       line[i+1] == '.' and line[i+2] == '.':
+                        self.tokens.append(('name', '...'))
+                        i = i + 3
+                        continue
+
+                    j = i + 1
+                    if j < l and (
+                       "+-*><=/%&!|".find(line[j]) != -1):
+#                        line[j] == '+' or line[j] == '-' or line[j] == '*' or \
+#                        line[j] == '>' or line[j] == '<' or line[j] == '=' or \
+#                        line[j] == '/' or line[j] == '%' or line[j] == '&' or \
+#                        line[j] == '!' or line[j] == '|'):
+                        self.tokens.append(('op', line[i:j+1]))
+                        i = j + 1
+                    else:
+                        self.tokens.append(('op', line[i]))
+                        i = i + 1
+                    continue
+                s = i
+                while i < l:
+                    o = ord(line[i])
+                    if (o >= 97 and o <= 122) or (o >= 65 and o <= 90) or \
+                       (o >= 48 and o <= 57) or (
+                        " \t(){}:;,+-*/%&!|[]=><".find(line[i]) == -1):
+#                         line[i] != ' ' and line[i] != '\t' and
+#                         line[i] != '(' and line[i] != ')' and
+#                         line[i] != '{'  and line[i] != '}' and
+#                         line[i] != ':' and line[i] != ';' and
+#                         line[i] != ',' and line[i] != '+' and
+#                         line[i] != '-' and line[i] != '*' and
+#                         line[i] != '/' and line[i] != '%' and
+#                         line[i] != '&' and line[i] != '!' and
+#                         line[i] != '|' and line[i] != '[' and
+#                         line[i] != ']' and line[i] != '=' and
+#                         line[i] != '*' and line[i] != '>' and
+#                         line[i] != '<'):
+                        i = i + 1
+                    else:
+                        break
+                self.tokens.append(('name', line[s:i]))
+
+        tok = self.tokens[0]
+        self.tokens = self.tokens[1:]
+        self.last = tok
+        return tok
+
+class CParser:
+    """The C module parser"""
+    def __init__(self, filename, idx = None):
+        self.filename = filename
+        if len(filename) > 2 and filename[-2:] == '.h':
+            self.is_header = 1
+        else:
+            self.is_header = 0
+        self.input = open(filename)
+        self.lexer = CLexer(self.input)
+        if idx == None:
+            self.index = index()
+        else:
+            self.index = idx
+        self.top_comment = ""
+        self.last_comment = ""
+        self.comment = None
+        self.collect_ref = 0
+        self.doc_disable = 0
+        self.conditionals = []
+        self.defines = []
+
+    def collect_references(self):
+        self.collect_ref = 1
+
+    def disable(self):
+        self.doc_disable = 1
+
+    def enable(self):
+        self.doc_disable = 0
+
+    def lineno(self):
+        return self.lexer.getlineno()
+
+    def index_add(self, name, module, static, type, info=None, extra = None):
+        if self.doc_disable:
+            return
+        if self.is_header == 1:
+            self.index.add(name, module, module, static, type, self.lineno(),
+                           info, extra, self.conditionals)
+        else:
+            self.index.add(name, None, module, static, type, self.lineno(),
+                           info, extra, self.conditionals)
+
+    def index_add_ref(self, name, module, static, type, info=None,
+                      extra = None):
+        if self.is_header == 1:
+            self.index.add_ref(name, module, module, static, type,
+                               self.lineno(), info, extra, self.conditionals)
+        else:
+            self.index.add_ref(name, None, module, static, type, self.lineno(),
+                               info, extra, self.conditionals)
+
+    def warning(self, msg):
+        if self.doc_disable:
+            return
+        print(msg)
+
+    def error(self, msg, token=-1):
+        if self.doc_disable:
+            return
+
+        print("Parse Error: " + msg)
+        if token != -1:
+            print("Got token ", token)
+        self.lexer.debug()
+        sys.exit(1)
+
+    def debug(self, msg, token=-1):
+        print("Debug: " + msg)
+        if token != -1:
+            print("Got token ", token)
+        self.lexer.debug()
+
+    def parseTopComment(self, comment):
+        res = {}
+        lines = comment.split("\n")
+        item = None
+        for line in lines:
+            while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                line = line[1:]
+            while line != "" and line[0] == '*':
+                line = line[1:]
+            while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                line = line[1:]
+            try:
+                (it, line) = line.split(":", 1)
+                item = it
+                while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                    line = line[1:]
+                if item in res:
+                    res[item] = res[item] + " " + line
+                else:
+                    res[item] = line
+            except:
+                if item != None:
+                    if item in res:
+                        res[item] = res[item] + " " + line
+                    else:
+                        res[item] = line
+        self.index.info = res
+
+    def parseComment(self, token):
+        if self.top_comment == "":
+            self.top_comment = token[1]
+        if self.comment == None or token[1][0] == '*':
+            self.comment = token[1];
+        else:
+            self.comment = self.comment + token[1]
+        token = self.lexer.token()
+
+        if self.comment.find("DOC_DISABLE") != -1:
+            self.disable()
+
+        if self.comment.find("DOC_ENABLE") != -1:
+            self.enable()
+
+        return token
+
+    #
+    # Parse a simple comment block for typedefs or global variables
+    #
+    def parseSimpleComment(self, name, quiet = False):
+        if name[0:2] == '__':
+            quiet = 1
+
+        args = []
+        desc = ""
+
+        if self.comment == None:
+            if not quiet:
+                self.warning("Missing comment for %s" % (name))
+            return(None)
+        if self.comment[0] != '*':
+            if not quiet:
+                self.warning("Missing * in comment for %s" % (name))
+            return(None)
+        lines = self.comment.split('\n')
+        if lines[0] == '*':
+            del lines[0]
+        if lines[0] != "* %s:" % (name):
+            if not quiet:
+                self.warning("Misformatted comment for %s" % (name))
+                self.warning("  Expecting '* %s:' got '%s'" % (name, lines[0]))
+            return(None)
+        del lines[0]
+        while len(lines) > 0 and lines[0] == '*':
+            del lines[0]
+        desc = ""
+        while len(lines) > 0:
+            l = lines[0]
+            while len(l) > 0 and l[0] == '*':
+                l = l[1:]
+            l = l.strip()
+            desc = desc + " " + l
+            del lines[0]
+
+        desc = desc.strip()
+
+        if quiet == 0:
+            if desc == "":
+                self.warning("Comment for %s lacks description" % (name))
+
+        return(desc)
+    #
+    # Parse a comment block associate to a macro
+    #
+    def parseMacroComment(self, name, quiet = 0):
+        if name[0:2] == '__':
+            quiet = 1
+
+        args = []
+        desc = ""
+
+        if self.comment == None:
+            if not quiet:
+                self.warning("Missing comment for macro %s" % (name))
+            return((args, desc))
+        if self.comment[0] != '*':
+            if not quiet:
+                self.warning("Missing * in macro comment for %s" % (name))
+            return((args, desc))
+        lines = self.comment.split('\n')
+        if lines[0] == '*':
+            del lines[0]
+        if lines[0] != "* %s:" % (name):
+            if not quiet:
+                self.warning("Misformatted macro comment for %s" % (name))
+                self.warning("  Expecting '* %s:' got '%s'" % (name, lines[0]))
+            return((args, desc))
+        del lines[0]
+        while lines[0] == '*':
+            del lines[0]
+        while len(lines) > 0 and lines[0][0:3] == '* @':
+            l = lines[0][3:]
+            try:
+                (arg, desc) = l.split(':', 1)
+                desc=desc.strip()
+                arg=arg.strip()
+            except:
+                if not quiet:
+                    self.warning("Misformatted macro comment for %s" % (name))
+                    self.warning("  problem with '%s'" % (lines[0]))
+                del lines[0]
+                continue
+            del lines[0]
+            l = lines[0].strip()
+            while len(l) > 2 and l[0:3] != '* @':
+                while l[0] == '*':
+                    l = l[1:]
+                desc = desc + ' ' + l.strip()
+                del lines[0]
+                if len(lines) == 0:
+                    break
+                l = lines[0]
+            args.append((arg, desc))
+        while len(lines) > 0 and lines[0] == '*':
+            del lines[0]
+        desc = ""
+        while len(lines) > 0:
+            l = lines[0]
+            while len(l) > 0 and l[0] == '*':
+                l = l[1:]
+            l = l.strip()
+            desc = desc + " " + l
+            del lines[0]
+
+        desc = desc.strip()
+
+        if quiet == 0:
+            if desc == "":
+                self.warning("Macro comment for %s lack description of the macro" % (name))
+
+        return((args, desc))
+
+     #
+     # Parse a comment block and merge the information found in the
+     # parameters descriptions, finally returns a block as complete
+     # as possible
+     #
+    def mergeFunctionComment(self, name, description, quiet = 0):
+        if name == 'main':
+            quiet = 1
+        if name[0:2] == '__':
+            quiet = 1
+
+        (ret, args) = description
+        desc = ""
+        retdesc = ""
+
+        if self.comment == None:
+            if not quiet:
+                self.warning("Missing comment for function %s" % (name))
+            return(((ret[0], retdesc), args, desc))
+        if self.comment[0] != '*':
+            if not quiet:
+                self.warning("Missing * in function comment for %s" % (name))
+            return(((ret[0], retdesc), args, desc))
+        lines = self.comment.split('\n')
+        if lines[0] == '*':
+            del lines[0]
+        if lines[0] != "* %s:" % (name):
+            if not quiet:
+                self.warning("Misformatted function comment for %s" % (name))
+                self.warning("  Expecting '* %s:' got '%s'" % (name, lines[0]))
+            return(((ret[0], retdesc), args, desc))
+        del lines[0]
+        while lines[0] == '*':
+            del lines[0]
+        nbargs = len(args)
+        while len(lines) > 0 and lines[0][0:3] == '* @':
+            l = lines[0][3:]
+            try:
+                (arg, desc) = l.split(':', 1)
+                desc=desc.strip()
+                arg=arg.strip()
+            except:
+                if not quiet:
+                    self.warning("Misformatted function comment for %s" % (name))
+                    self.warning("  problem with '%s'" % (lines[0]))
+                del lines[0]
+                continue
+            del lines[0]
+            l = lines[0].strip()
+            while len(l) > 2 and l[0:3] != '* @':
+                while l[0] == '*':
+                    l = l[1:]
+                desc = desc + ' ' + l.strip()
+                del lines[0]
+                if len(lines) == 0:
+                    break
+                l = lines[0]
+            i = 0
+            while i < nbargs:
+                if args[i][1] == arg:
+                    args[i] = (args[i][0], arg, desc)
+                    break;
+                i = i + 1
+            if i >= nbargs:
+                if not quiet:
+                    self.warning("Unable to find arg %s from function comment for %s" % (
+                       arg, name))
+        while len(lines) > 0 and lines[0] == '*':
+            del lines[0]
+        desc = ""
+        while len(lines) > 0:
+            l = lines[0]
+            while len(l) > 0 and l[0] == '*':
+                l = l[1:]
+            l = l.strip()
+            if len(l) >= 6 and  l[0:6] == "return" or l[0:6] == "Return":
+                try:
+                    l = l.split(' ', 1)[1]
+                except:
+                    l = ""
+                retdesc = l.strip()
+                del lines[0]
+                while len(lines) > 0:
+                    l = lines[0]
+                    while len(l) > 0 and l[0] == '*':
+                        l = l[1:]
+                    l = l.strip()
+                    retdesc = retdesc + " " + l
+                    del lines[0]
+            else:
+                desc = desc + " " + l
+                del lines[0]
+
+        retdesc = retdesc.strip()
+        desc = desc.strip()
+
+        if quiet == 0:
+             #
+             # report missing comments
+             #
+            i = 0
+            while i < nbargs:
+                if args[i][2] == None and args[i][0] != "void" and \
+                   ((args[i][1] != None) or (args[i][1] == '')):
+                    self.warning("Function comment for %s lacks description of arg %s" % (name, args[i][1]))
+                i = i + 1
+            if retdesc == "" and ret[0] != "void":
+                self.warning("Function comment for %s lacks description of return value" % (name))
+            if desc == "" and retdesc == "":
+                self.warning("Function comment for %s lacks description of the function" % (name))
+
+        return(((ret[0], retdesc), args, desc))
+
+    def parsePreproc(self, token):
+        if debug:
+            print("=> preproc ", token, self.lexer.tokens)
+        name = token[1]
+        if name == "#include":
+            token = self.lexer.token()
+            if token == None:
+                return None
+            if token[0] == 'preproc':
+                self.index_add(token[1], self.filename, not self.is_header,
+                                "include")
+                return self.lexer.token()
+            return token
+        if name == "#define":
+            token = self.lexer.token()
+            if token == None:
+                return None
+            if token[0] == 'preproc':
+                 # TODO macros with arguments
+                name = token[1]
+                lst = []
+                token = self.lexer.token()
+                while token != None and token[0] == 'preproc' and \
+                      token[1][0] != '#':
+                    lst.append(token[1])
+                    token = self.lexer.token()
+                try:
+                    name = name.split('(') [0]
+                except:
+                    pass
+                info = self.parseMacroComment(name, True)
+                self.index_add(name, self.filename, not self.is_header,
+                                "macro", info)
+                return token
+
+        #
+        # Processing of conditionals modified by Bill 1/1/05
+        #
+        # We process conditionals (i.e. tokens from #ifdef, #ifndef,
+        # #if, #else and #endif) for headers and mainline code,
+        # store the ones from the header in libxml2-api.xml, and later
+        # (in the routine merge_public) verify that the two (header and
+        # mainline code) agree.
+        #
+        # There is a small problem with processing the headers. Some of
+        # the variables are not concerned with enabling / disabling of
+        # library functions (e.g. '__XML_PARSER_H__'), and we don't want
+        # them to be included in libxml2-api.xml, or involved in
+        # the check between the header and the mainline code.  To
+        # accomplish this, we ignore any conditional which doesn't include
+        # the string 'ENABLED'
+        #
+        if name == "#ifdef":
+            apstr = self.lexer.tokens[0][1]
+            try:
+                self.defines.append(apstr)
+                if apstr.find('ENABLED') != -1:
+                    self.conditionals.append("defined(%s)" % apstr)
+            except:
+                pass
+        elif name == "#ifndef":
+            apstr = self.lexer.tokens[0][1]
+            try:
+                self.defines.append(apstr)
+                if apstr.find('ENABLED') != -1:
+                    self.conditionals.append("!defined(%s)" % apstr)
+            except:
+                pass
+        elif name == "#if":
+            apstr = ""
+            for tok in self.lexer.tokens:
+                if apstr != "":
+                    apstr = apstr + " "
+                apstr = apstr + tok[1]
+            try:
+                self.defines.append(apstr)
+                if apstr.find('ENABLED') != -1:
+                    self.conditionals.append(apstr)
+            except:
+                pass
+        elif name == "#else":
+            if self.conditionals != [] and \
+               self.defines[-1].find('ENABLED') != -1:
+                self.conditionals[-1] = "!(%s)" % self.conditionals[-1]
+        elif name == "#endif":
+            if self.conditionals != [] and \
+               self.defines[-1].find('ENABLED') != -1:
+                self.conditionals = self.conditionals[:-1]
+            self.defines = self.defines[:-1]
+        token = self.lexer.token()
+        while token != None and token[0] == 'preproc' and \
+            token[1][0] != '#':
+            token = self.lexer.token()
+        return token
+
+     #
+     # token acquisition on top of the lexer, it handle internally
+     # preprocessor and comments since they are logically not part of
+     # the program structure.
+     #
+    def token(self):
+        global ignored_words
+
+        token = self.lexer.token()
+        while token != None:
+            if token[0] == 'comment':
+                token = self.parseComment(token)
+                continue
+            elif token[0] == 'preproc':
+                token = self.parsePreproc(token)
+                continue
+            elif token[0] == "name" and token[1] == "__const":
+                token = ("name", "const")
+                return token
+            elif token[0] == "name" and token[1] == "__attribute":
+                token = self.lexer.token()
+                while token != None and token[1] != ";":
+                    token = self.lexer.token()
+                return token
+            elif token[0] == "name" and token[1] in ignored_words:
+                (n, info) = ignored_words[token[1]]
+                i = 0
+                while i < n:
+                    token = self.lexer.token()
+                    i = i + 1
+                token = self.lexer.token()
+                continue
+            else:
+                if debug:
+                    print("=> ", token)
+                return token
+        return None
+
+     #
+     # Parse a typedef, it records the type and its name.
+     #
+    def parseTypedef(self, token):
+        if token == None:
+            return None
+        token = self.parseType(token)
+        if token == None:
+            self.error("parsing typedef")
+            return None
+        base_type = self.type
+        type = base_type
+         #self.debug("end typedef type", token)
+        while token != None:
+            if token[0] == "name":
+                name = token[1]
+                signature = self.signature
+                if signature != None:
+                    type = type.split('(')[0]
+                    d = self.mergeFunctionComment(name,
+                            ((type, None), signature), 1)
+                    self.index_add(name, self.filename, not self.is_header,
+                                    "functype", d)
+                else:
+                    if base_type == "struct":
+                        self.index_add(name, self.filename, not self.is_header,
+                                        "struct", type)
+                        base_type = "struct " + name
+                    else:
+                        # TODO report missing or misformatted comments
+                        info = self.parseSimpleComment(name, True)
+                        self.index_add(name, self.filename, not self.is_header,
+                                    "typedef", type, info)
+                token = self.token()
+            else:
+                self.error("parsing typedef: expecting a name")
+                return token
+             #self.debug("end typedef", token)
+            if token != None and token[0] == 'sep' and token[1] == ',':
+                type = base_type
+                token = self.token()
+                while token != None and token[0] == "op":
+                    type = type + token[1]
+                    token = self.token()
+            elif token != None and token[0] == 'sep' and token[1] == ';':
+                break;
+            elif token != None and token[0] == 'name':
+                type = base_type
+                continue;
+            else:
+                self.error("parsing typedef: expecting ';'", token)
+                return token
+        token = self.token()
+        return token
+
+     #
+     # Parse a C code block, used for functions it parse till
+     # the balancing } included
+     #
+    def parseBlock(self, token):
+        while token != None:
+            if token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseBlock(token)
+            elif token[0] == "sep" and token[1] == "}":
+                token = self.token()
+                return token
+            else:
+                if self.collect_ref == 1:
+                    oldtok = token
+                    token = self.token()
+                    if oldtok[0] == "name" and oldtok[1][0:3] == "xml":
+                        if token[0] == "sep" and token[1] == "(":
+                            self.index_add_ref(oldtok[1], self.filename,
+                                                0, "function")
+                            token = self.token()
+                        elif token[0] == "name":
+                            token = self.token()
+                            if token[0] == "sep" and (token[1] == ";" or
+                               token[1] == "," or token[1] == "="):
+                                self.index_add_ref(oldtok[1], self.filename,
+                                                    0, "type")
+                    elif oldtok[0] == "name" and oldtok[1][0:4] == "XML_":
+                        self.index_add_ref(oldtok[1], self.filename,
+                                            0, "typedef")
+                    elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXML_":
+                        self.index_add_ref(oldtok[1], self.filename,
+                                            0, "typedef")
+
+                else:
+                    token = self.token()
+        return token
+
+     #
+     # Parse a C struct definition till the balancing }
+     #
+    def parseStruct(self, token):
+        fields = []
+         #self.debug("start parseStruct", token)
+        while token != None:
+            if token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseTypeBlock(token)
+            elif token[0] == "sep" and token[1] == "}":
+                self.struct_fields = fields
+                 #self.debug("end parseStruct", token)
+                 #print fields
+                token = self.token()
+                return token
+            else:
+                base_type = self.type
+                 #self.debug("before parseType", token)
+                token = self.parseType(token)
+                 #self.debug("after parseType", token)
+                if token != None and token[0] == "name":
+                    fname = token[1]
+                    token = self.token()
+                    if token[0] == "sep" and token[1] == ";":
+                        token = self.token()
+                        fields.append((self.type, fname))
+                    else:
+                        self.error("parseStruct: expecting ;", token)
+                elif token != None and token[0] == "sep" and token[1] == "{":
+                    token = self.token()
+                    token = self.parseTypeBlock(token)
+                    if token != None and token[0] == "name":
+                        token = self.token()
+                    if token != None and token[0] == "sep" and token[1] == ";":
+                        token = self.token()
+                    else:
+                        self.error("parseStruct: expecting ;", token)
+                else:
+                    self.error("parseStruct: name", token)
+                    token = self.token()
+                self.type = base_type;
+        self.struct_fields = fields
+         #self.debug("end parseStruct", token)
+         #print fields
+        return token
+
+     #
+     # Parse a C enum block, parse till the balancing }
+     #
+    def parseEnumBlock(self, token):
+        self.enums = []
+        name = None
+        self.comment = None
+        comment = ""
+        value = "0"
+        while token != None:
+            if token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseTypeBlock(token)
+            elif token[0] == "sep" and token[1] == "}":
+                if name != None:
+                    if self.comment != None:
+                        comment = self.comment
+                        self.comment = None
+                    self.enums.append((name, value, comment))
+                token = self.token()
+                return token
+            elif token[0] == "name":
+                    if name != None:
+                        if self.comment != None:
+                            comment = self.comment.strip()
+                            self.comment = None
+                        self.enums.append((name, value, comment))
+                    name = token[1]
+                    comment = ""
+                    token = self.token()
+                    if token[0] == "op" and token[1][0] == "=":
+                        value = ""
+                        if len(token[1]) > 1:
+                            value = token[1][1:]
+                        token = self.token()
+                        while token[0] != "sep" or (token[1] != ',' and
+                              token[1] != '}'):
+                            value = value + token[1]
+                            token = self.token()
+                    else:
+                        try:
+                            value = "%d" % (int(value) + 1)
+                        except:
+                            self.warning("Failed to compute value of enum %s" % (name))
+                            value=""
+                    if token[0] == "sep" and token[1] == ",":
+                        token = self.token()
+            else:
+                token = self.token()
+        return token
+
+     #
+     # Parse a C definition block, used for structs it parse till
+     # the balancing }
+     #
+    def parseTypeBlock(self, token):
+        while token != None:
+            if token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseTypeBlock(token)
+            elif token[0] == "sep" and token[1] == "}":
+                token = self.token()
+                return token
+            else:
+                token = self.token()
+        return token
+
+     #
+     # Parse a type: the fact that the type name can either occur after
+     #    the definition or within the definition makes it a little harder
+     #    if inside, the name token is pushed back before returning
+     #
+    def parseType(self, token):
+        self.type = ""
+        self.struct_fields = []
+        self.signature = None
+        if token == None:
+            return token
+
+        have_sign = 0
+        done = 0
+
+        while token[0] == "name" and (
+              token[1] == "const" or \
+              token[1] == "unsigned" or \
+              token[1] == "signed"):
+            if token[1] == "unsigned" or token[1] == "signed":
+                have_sign = 1
+            if self.type == "":
+                self.type = token[1]
+            else:
+                self.type = self.type + " " + token[1]
+            token = self.token()
+
+        if token[0] == "name" and token[1] in ("char", "short", "int", "long"):
+            if self.type == "":
+                self.type = token[1]
+            else:
+                self.type = self.type + " " + token[1]
+
+        elif have_sign:
+            done = 1
+
+        elif token[0] == "name" and token[1] == "struct":
+            if self.type == "":
+                self.type = token[1]
+            else:
+                self.type = self.type + " " + token[1]
+            token = self.token()
+            nametok = None
+            if token[0] == "name":
+                nametok = token
+                token = self.token()
+            if token != None and token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseStruct(token)
+            elif token != None and token[0] == "op" and token[1] == "*":
+                self.type = self.type + " " + nametok[1] + " *"
+                token = self.token()
+                while token != None and token[0] == "op" and token[1] == "*":
+                    self.type = self.type + " *"
+                    token = self.token()
+                if token[0] == "name":
+                    nametok = token
+                    token = self.token()
+                else:
+                    self.error("struct : expecting name", token)
+                    return token
+            elif token != None and token[0] == "name" and nametok != None:
+                self.type = self.type + " " + nametok[1]
+                return token
+
+            if nametok != None:
+                self.lexer.push(token)
+                token = nametok
+            return token
+
+        elif token[0] == "name" and token[1] == "enum":
+            if self.type == "":
+                self.type = token[1]
+            else:
+                self.type = self.type + " " + token[1]
+            self.enums = []
+            token = self.token()
+            if token != None and token[0] == "sep" and token[1] == "{":
+                token = self.token()
+                token = self.parseEnumBlock(token)
+            else:
+                self.error("parsing enum: expecting '{'", token)
+            enum_type = None
+            if token != None and token[0] != "name":
+                self.lexer.push(token)
+                token = ("name", "enum")
+            else:
+                enum_type = token[1]
+            for enum in self.enums:
+                self.index_add(enum[0], self.filename,
+                               not self.is_header, "enum",
+                               (enum[1], enum[2], enum_type))
+            return token
+
+        elif token[0] == "name":
+            if self.type == "":
+                self.type = token[1]
+            else:
+                self.type = self.type + " " + token[1]
+        else:
+            self.error("parsing type %s: expecting a name" % (self.type),
+                       token)
+            return token
+        if not done:
+            token = self.token()
+        while token != None and (token[0] == "op" or
+              token[0] == "name" and token[1] == "const"):
+            self.type = self.type + " " + token[1]
+            token = self.token()
+
+         #
+         # if there is a parenthesis here, this means a function type
+         #
+        if token != None and token[0] == "sep" and token[1] == '(':
+            self.type = self.type + token[1]
+            token = self.token()
+            while token != None and token[0] == "op" and token[1] == '*':
+                self.type = self.type + token[1]
+                token = self.token()
+            if token == None or token[0] != "name" :
+                self.error("parsing function type, name expected", token);
+                return token
+            self.type = self.type + token[1]
+            nametok = token
+            token = self.token()
+            if token != None and token[0] == "sep" and token[1] == ')':
+                self.type = self.type + token[1]
+                token = self.token()
+                if token != None and token[0] == "sep" and token[1] == '(':
+                    token = self.token()
+                    type = self.type;
+                    token = self.parseSignature(token);
+                    self.type = type;
+                else:
+                    self.error("parsing function type, '(' expected", token);
+                    return token
+            else:
+                self.error("parsing function type, ')' expected", token);
+                return token
+            self.lexer.push(token)
+            token = nametok
+            return token
+
+         #
+         # do some lookahead for arrays
+         #
+        if token != None and token[0] == "name":
+            nametok = token
+            token = self.token()
+            if token != None and token[0] == "sep" and token[1] == '[':
+                self.type = self.type + nametok[1]
+                while token != None and token[0] == "sep" and token[1] == '[':
+                    self.type = self.type + token[1]
+                    token = self.token()
+                    while token != None and token[0] != 'sep' and \
+                          token[1] != ']' and token[1] != ';':
+                        self.type = self.type + token[1]
+                        token = self.token()
+                if token != None and token[0] == 'sep' and token[1] == ']':
+                    self.type = self.type + token[1]
+                    token = self.token()
+                else:
+                    self.error("parsing array type, ']' expected", token);
+                    return token
+            elif token != None and token[0] == "sep" and token[1] == ':':
+                 # remove :12 in case it's a limited int size
+                token = self.token()
+                token = self.token()
+            self.lexer.push(token)
+            token = nametok
+
+        return token
+
+     #
+     # Parse a signature: '(' has been parsed and we scan the type definition
+     #    up to the ')' included
+    def parseSignature(self, token):
+        signature = []
+        if token != None and token[0] == "sep" and token[1] == ')':
+            self.signature = []
+            token = self.token()
+            return token
+        while token != None:
+            token = self.parseType(token)
+            if token != None and token[0] == "name":
+                signature.append((self.type, token[1], None))
+                token = self.token()
+            elif token != None and token[0] == "sep" and token[1] == ',':
+                token = self.token()
+                continue
+            elif token != None and token[0] == "sep" and token[1] == ')':
+                 # only the type was provided
+                if self.type == "...":
+                    signature.append((self.type, "...", None))
+                else:
+                    signature.append((self.type, None, None))
+            if token != None and token[0] == "sep":
+                if token[1] == ',':
+                    token = self.token()
+                    continue
+                elif token[1] == ')':
+                    token = self.token()
+                    break
+        self.signature = signature
+        return token
+
+     #
+     # Parse a global definition, be it a type, variable or function
+     # the extern "C" blocks are a bit nasty and require it to recurse.
+     #
+    def parseGlobal(self, token):
+        static = 0
+        if token[1] == 'extern':
+            token = self.token()
+            if token == None:
+                return token
+            if token[0] == 'string':
+                if token[1] == 'C':
+                    token = self.token()
+                    if token == None:
+                        return token
+                    if token[0] == 'sep' and token[1] == "{":
+                        token = self.token()
+#                         print 'Entering extern "C line ', self.lineno()
+                        while token != None and (token[0] != 'sep' or
+                              token[1] != "}"):
+                            if token[0] == 'name':
+                                token = self.parseGlobal(token)
+                            else:
+                                self.error(
+                                 "token %s %s unexpected at the top level" % (
+                                        token[0], token[1]))
+                                token = self.parseGlobal(token)
+#                         print 'Exiting extern "C" line', self.lineno()
+                        token = self.token()
+                        return token
+                else:
+                    return token
+        elif token[1] == 'static':
+            static = 1
+            token = self.token()
+            if token == None or  token[0] != 'name':
+                return token
+
+        if token[1] == 'typedef':
+            token = self.token()
+            return self.parseTypedef(token)
+        else:
+            token = self.parseType(token)
+            type_orig = self.type
+        if token == None or token[0] != "name":
+            return token
+        type = type_orig
+        self.name = token[1]
+        token = self.token()
+        while token != None and (token[0] == "sep" or token[0] == "op"):
+            if token[0] == "sep":
+                if token[1] == "[":
+                    type = type + token[1]
+                    token = self.token()
+                    while token != None and (token[0] != "sep" or \
+                          token[1] != ";"):
+                        type = type + token[1]
+                        token = self.token()
+
+            if token != None and token[0] == "op" and token[1] == "=":
+                 #
+                 # Skip the initialization of the variable
+                 #
+                token = self.token()
+                if token[0] == 'sep' and token[1] == '{':
+                    token = self.token()
+                    token = self.parseBlock(token)
+                else:
+                    while token != None and (token[0] != "sep" or \
+                          (token[1] != ';' and token[1] != ',')):
+                            token = self.token()
+                if token == None or token[0] != "sep" or (token[1] != ';' and
+                   token[1] != ','):
+                    self.error("missing ';' or ',' after value")
+
+            if token != None and token[0] == "sep":
+                if token[1] == ";":
+                    if type == "struct":
+                        self.index_add(self.name, self.filename,
+                             not self.is_header, "struct", self.struct_fields)
+                    else:
+                        info = self.parseSimpleComment(self.name, True)
+                        self.index_add(self.name, self.filename,
+                             not self.is_header, "variable", type, info)
+                    self.comment = None
+                    token = self.token()
+                    break
+                elif token[1] == "(":
+                    token = self.token()
+                    token = self.parseSignature(token)
+                    if token == None:
+                        return None
+                    if token[0] == "sep" and token[1] == ";":
+                        d = self.mergeFunctionComment(self.name,
+                                ((type, None), self.signature), 1)
+                        self.index_add(self.name, self.filename, static,
+                                        "function", d)
+                        self.comment = None
+                        token = self.token()
+                    elif token[0] == "sep" and token[1] == "{":
+                        d = self.mergeFunctionComment(self.name,
+                                ((type, None), self.signature), static)
+                        self.index_add(self.name, self.filename, static,
+                                        "function", d)
+                        self.comment = None
+                        token = self.token()
+                        token = self.parseBlock(token);
+                elif token[1] == ',':
+                    self.index_add(self.name, self.filename, static,
+                                    "variable", type)
+                    self.comment = None
+                    type = type_orig
+                    token = self.token()
+                    while token != None and token[0] == "sep":
+                        type = type + token[1]
+                        token = self.token()
+                    if token != None and token[0] == "name":
+                        self.name = token[1]
+                        token = self.token()
+                else:
+                    break
+
+        return token
+
+    def parse(self):
+        self.warning("Parsing %s" % (self.filename))
+        token = self.token()
+        while token != None:
+            if token[0] == 'name':
+                token = self.parseGlobal(token)
+            else:
+                self.error("token %s %s unexpected at the top level" % (
+                       token[0], token[1]))
+                token = self.parseGlobal(token)
+                return
+        self.parseTopComment(self.top_comment)
+        return self.index
+
+
+class docBuilder:
+    """A documentation builder"""
+    def __init__(self, name, directories=['.'], excludes=[]):
+        self.name = name
+        self.directories = directories
+        self.excludes = excludes + list(ignored_files.keys())
+        self.modules = {}
+        self.headers = {}
+        self.idx = index()
+        self.index = {}
+        if name == 'libxml2':
+            self.basename = 'libxml'
+        else:
+            self.basename = name
+
+    def analyze(self):
+        print("Project %s : %d headers, %d modules" % (self.name, len(list(self.headers.keys())), len(list(self.modules.keys()))))
+        self.idx.analyze()
+
+    def scanHeaders(self):
+        for header in list(self.headers.keys()):
+            parser = CParser(header)
+            idx = parser.parse()
+            self.headers[header] = idx;
+            self.idx.merge(idx)
+
+    def scanModules(self):
+        for module in list(self.modules.keys()):
+            parser = CParser(module)
+            idx = parser.parse()
+            # idx.analyze()
+            self.modules[module] = idx
+            self.idx.merge_public(idx)
+
+    def scan(self):
+        for directory in self.directories:
+            files = glob.glob(directory + "/*.c")
+            for file in files:
+                skip = 0
+                for excl in self.excludes:
+                    if file.find(excl) != -1:
+                        print("Skipping %s" % file)
+                        skip = 1
+                        break
+                if skip == 0:
+                    self.modules[file] = None;
+            files = glob.glob(directory + "/*.h")
+            for file in files:
+                skip = 0
+                for excl in self.excludes:
+                    if file.find(excl) != -1:
+                        print("Skipping %s" % file)
+                        skip = 1
+                        break
+                if skip == 0:
+                    self.headers[file] = None;
+        self.scanHeaders()
+        self.scanModules()
+
+    def modulename_file(self, file):
+        module = os.path.basename(file)
+        if module[-2:] == '.h':
+            module = module[:-2]
+        elif module[-2:] == '.c':
+            module = module[:-2]
+        return module
+
+    def serialize_enum(self, output, name):
+        id = self.idx.enums[name]
+        output.write("    <enum name='%s' file='%s'" % (name,
+                     self.modulename_file(id.header)))
+        if id.info != None:
+            info = id.info
+            if info[0] != None and info[0] != '':
+                try:
+                    val = eval(info[0])
+                except:
+                    val = info[0]
+                output.write(" value='%s'" % (val));
+            if info[2] != None and info[2] != '':
+                output.write(" type='%s'" % info[2]);
+            if info[1] != None and info[1] != '':
+                output.write(" info='%s'" % escape(info[1]));
+        output.write("/>\n")
+
+    def serialize_macro(self, output, name):
+        id = self.idx.macros[name]
+        output.write("    <macro name='%s' file='%s'>\n" % (name,
+                     self.modulename_file(id.header)))
+        if id.info != None:
+            try:
+                (args, desc) = id.info
+                if desc != None and desc != "":
+                    output.write("      <info>%s</info>\n" % (escape(desc)))
+                for arg in args:
+                    (name, desc) = arg
+                    if desc != None and desc != "":
+                        output.write("      <arg name='%s' info='%s'/>\n" % (
+                                     name, escape(desc)))
+                    else:
+                        output.write("      <arg name='%s'/>\n" % (name))
+            except:
+                pass
+        output.write("    </macro>\n")
+
+    def serialize_typedef(self, output, name):
+        id = self.idx.typedefs[name]
+        if id.info[0:7] == 'struct ':
+            output.write("    <struct name='%s' file='%s' type='%s'" % (
+                     name, self.modulename_file(id.header), id.info))
+            name = id.info[7:]
+            if name in self.idx.structs and ( \
+               type(self.idx.structs[name].info) == type(()) or
+                type(self.idx.structs[name].info) == type([])):
+                output.write(">\n");
+                try:
+                    for field in self.idx.structs[name].info:
+                        output.write("      <field name='%s' type='%s'/>\n" % (field[1] , field[0]))
+                except:
+                    print("Failed to serialize struct %s" % (name))
+                output.write("    </struct>\n")
+            else:
+                output.write("/>\n");
+        else :
+            output.write("    <typedef name='%s' file='%s' type='%s'" % (
+                         name, self.modulename_file(id.header), id.info))
+            try:
+                desc = id.extra
+                if desc != None and desc != "":
+                    output.write(">\n      <info>%s</info>\n" % (escape(desc)))
+                    output.write("    </typedef>\n")
+                else:
+                    output.write("/>\n")
+            except:
+                output.write("/>\n")
+
+    def serialize_variable(self, output, name):
+        id = self.idx.variables[name]
+        if id.info != None:
+            output.write("    <variable name='%s' file='%s' type='%s'" % (
+                    name, self.modulename_file(id.header), id.info))
+        else:
+            output.write("    <variable name='%s' file='%s'" % (
+                    name, self.modulename_file(id.header)))
+        desc = id.extra
+        if desc != None and desc != "":
+            output.write(">\n      <info>%s</info>\n" % (escape(desc)))
+            output.write("    </variable>\n")
+        else:
+            output.write("/>\n")
+
+    def serialize_function(self, output, name):
+        id = self.idx.functions[name]
+        if name == debugsym:
+            print("=>", id)
+
+        output.write("    <%s name='%s' file='%s' module='%s'>\n" % (id.type,
+                     name, self.modulename_file(id.header),
+                     self.modulename_file(id.module)))
+        #
+        # Processing of conditionals modified by Bill 1/1/05
+        #
+        if id.conditionals != None:
+            apstr = ""
+            for cond in id.conditionals:
+                if apstr != "":
+                    apstr = apstr + " &amp;&amp; "
+                apstr = apstr + cond
+            output.write("      <cond>%s</cond>\n"% (apstr));
+        try:
+            (ret, params, desc) = id.info
+            if (desc == None or desc == '') and \
+               name[0:9] != "xmlThrDef" and name != "xmlDllMain" and \
+               ret[1] == '':
+                print("%s %s from %s has no description" % (id.type, name,
+                       self.modulename_file(id.module)))
+
+            output.write("      <info>%s</info>\n" % (escape(desc)))
+            if ret[0] != None:
+                if ret[0] == "void":
+                    output.write("      <return type='void'/>\n")
+                else:
+                    output.write("      <return type='%s' info='%s'/>\n" % (
+                             ret[0], escape(ret[1])))
+            for param in params:
+                if param[0] == 'void':
+                    continue
+                if param[2] == None:
+                    output.write("      <arg name='%s' type='%s' info=''/>\n" % (param[1], param[0]))
+                else:
+                    output.write("      <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2])))
+        except:
+            print("Failed to save function %s info: " % name, repr(id.info))
+        output.write("    </%s>\n" % (id.type))
+
+    def serialize_exports(self, output, file):
+        module = self.modulename_file(file)
+        output.write("    <file name='%s'>\n" % (module))
+        dict = self.headers[file]
+        if dict.info != None:
+            for data in ('Summary', 'Description', 'Author'):
+                try:
+                    output.write("     <%s>%s</%s>\n" % (
+                                 data.lower(),
+                                 escape(dict.info[data]),
+                                 data.lower()))
+                except:
+                    if data != 'Author':
+                        print("Header %s lacks a %s description" % (module, data))
+            if 'Description' in dict.info:
+                desc = dict.info['Description']
+                if desc.find("DEPRECATED") != -1:
+                    output.write("     <deprecated/>\n")
+
+        ids = list(dict.macros.keys())
+        ids.sort()
+        for id in ids:
+            # Macros are sometime used to masquerade other types.
+            if id in dict.functions:
+                continue
+            if id in dict.variables:
+                continue
+            if id in dict.typedefs:
+                continue
+            if id in dict.structs:
+                continue
+            if id in dict.enums:
+                continue
+            output.write("     <exports symbol='%s' type='macro'/>\n" % (id))
+        ids = list(dict.enums.keys())
+        ids.sort()
+        for id in ids:
+            output.write("     <exports symbol='%s' type='enum'/>\n" % (id))
+        ids = list(dict.typedefs.keys())
+        ids.sort()
+        for id in ids:
+            output.write("     <exports symbol='%s' type='typedef'/>\n" % (id))
+        ids = list(dict.structs.keys())
+        ids.sort()
+        for id in ids:
+            output.write("     <exports symbol='%s' type='struct'/>\n" % (id))
+        ids = list(dict.variables.keys())
+        ids.sort()
+        for id in ids:
+            output.write("     <exports symbol='%s' type='variable'/>\n" % (id))
+        ids = list(dict.functions.keys())
+        ids.sort()
+        for id in ids:
+            output.write("     <exports symbol='%s' type='function'/>\n" % (id))
+        output.write("    </file>\n")
+
+    def serialize(self):
+        filename = "%s-api.xml" % self.name
+        print("Saving XML description %s" % (filename))
+        output = open(filename, "w")
+        output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n')
+        output.write("<api name='%s'>\n" % self.name)
+        output.write("  <files>\n")
+        headers = list(self.headers.keys())
+        headers.sort()
+        for file in headers:
+            self.serialize_exports(output, file)
+        output.write("  </files>\n")
+        output.write("  <symbols>\n")
+        macros = list(self.idx.macros.keys())
+        macros.sort()
+        for macro in macros:
+            self.serialize_macro(output, macro)
+        enums = list(self.idx.enums.keys())
+        enums.sort()
+        for enum in enums:
+            self.serialize_enum(output, enum)
+        typedefs = list(self.idx.typedefs.keys())
+        typedefs.sort()
+        for typedef in typedefs:
+            self.serialize_typedef(output, typedef)
+        variables = list(self.idx.variables.keys())
+        variables.sort()
+        for variable in variables:
+            self.serialize_variable(output, variable)
+        functions = list(self.idx.functions.keys())
+        functions.sort()
+        for function in functions:
+            self.serialize_function(output, function)
+        output.write("  </symbols>\n")
+        output.write("</api>\n")
+        output.close()
+
+
+def rebuild():
+    builder = None
+    if glob.glob("parser.c") != [] :
+        print("Rebuilding API description for libxml2")
+        builder = docBuilder("libxml2", [".", "."],
+                             ["tst.c"])
+    elif glob.glob("../parser.c") != [] :
+        print("Rebuilding API description for libxml2")
+        builder = docBuilder("libxml2", ["..", "../include/libxml"],
+                             ["tst.c"])
+    elif glob.glob("../libxslt/transform.c") != [] :
+        print("Rebuilding API description for libxslt")
+        builder = docBuilder("libxslt", ["../libxslt"],
+                             ["win32config.h", "libxslt.h", "tst.c"])
+    else:
+        print("rebuild() failed, unable to guess the module")
+        return None
+    builder.scan()
+    builder.analyze()
+    builder.serialize()
+    if glob.glob("../libexslt/exslt.c") != [] :
+        extra = docBuilder("libexslt", ["../libexslt"], ["libexslt.h"])
+        extra.scan()
+        extra.analyze()
+        extra.serialize()
+    return builder
+
+#
+# for debugging the parser
+#
+def parse(filename):
+    parser = CParser(filename)
+    idx = parser.parse()
+    return idx
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        debug = 1
+        parse(sys.argv[1])
+    else:
+        rebuild()

local-test-libxml2-delta-01/afc-libxml2/doc/meson.build

@@ -0,0 +1,12 @@
+
+install_man(files(['xml2-config.1', 'xmlcatalog.1', 'xmllint.1']))
+
+
+tutorial_files = files(
+    'xmlcatalog.html',
+    'xmllint.html',
+)
+
+install_data(tutorial_files, install_dir: dir_doc)
+
+subdir('devhelp')

local-test-libxml2-delta-01/afc-libxml2/doc/xml2-config.1

@@ -0,0 +1,32 @@
+.TH xml2-config 1 "3 April 2022" Version 1.2.0
+.SH NAME
+xml2-config - script to get information about the installed version of libxml2
+.SH SYNOPSIS
+.B xml2-config
+[\-\-prefix\fI[=DIR]\fP] [\-\-libs] [\-\-cflags] [\-\-version] [\-\-help]
+.SH DESCRIPTION
+\fIxml2-config\fP is a tool that is used to determine the compile and
+linker flags that should be used to compile and link programs that use
+\fIlibxml2\fP.
+.SH OPTIONS
+\fIxml2-config\fP accepts the following options:
+.TP 8
+.B  \-\-version
+Print the currently installed version of \fIlibxml2\fP on the standard output.
+.TP 8
+.B  \-\-libs
+Print the linker flags that are necessary to link a \fIlibxml2\fP program.
+Add \-\-dynamic after \-\-libs to print only shared library linking
+information.
+.TP 8
+.B  \-\-cflags
+Print the compiler flags that are necessary to compile a \fIlibxml2\fP program.
+.TP 8
+.B  \-\-prefix=PREFIX
+If specified, use PREFIX instead of the installation prefix that
+\fIlibxml2\fP was built with when computing the output for the
+\-\-cflags and \-\-libs options. This option must be specified before
+any \-\-libs or \-\-cflags options.
+.SH AUTHOR
+This manual page was written by Fredrik Hallenberg <hallon@lysator.liu.se>,
+for the Debian GNU/linux system (but may be used by others).

local-test-libxml2-delta-01/afc-libxml2/doc/xmlcatalog.1

@@ -0,0 +1,356 @@
+'\" t
+.\"     Title: xmlcatalog
+.\"    Author: John Fleck <jfleck@inkstain.net>
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 06/12/2024
+.\"    Manual: xmlcatalog Manual
+.\"    Source: libxml2
+.\"  Language: English
+.\"
+.TH "XMLCATALOG" "1" "06/12/2024" "libxml2" "xmlcatalog Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+xmlcatalog \- Command line tool to parse and manipulate XML or SGML catalog files\&.
+.SH "SYNOPSIS"
+.HP \w'\fBxmlcatalog\fR\ 'u
+\fBxmlcatalog\fR [\fB\-\-sgml\fR | \fB\-\-shell\fR | \fB\-\-convert\fR | \fB\-\-create\fR | \fB\-\-del\ \fR\fB\fIVALUE(S)\fR\fR | [\ \fB\-\-add\ \fR\fB\fITYPE\fR\fR\fB\ \fR\fB\fIORIG\fR\fR\fB\ \fR\fB\fIREPLACE\fR\fR\fB\ \fR\ |\ \fB\-\-add\ \fR\fB\fIFILENAME\fR\fR] | \fB\-\-noout\fR | \fB\-\-no\-super\-update\fR | [\fB\-v\fR\ |\ \fB\-\-verbose\fR]] {\fICATALOGFILE\fR} {\fIENTITIES\fR...}
+.SH "DESCRIPTION"
+.PP
+\fBxmlcatalog\fR
+is a command line application allowing users to monitor and manipulate
+XML
+and
+SGML
+catalogs\&. It is included in
+\fBlibxml\fR(3)\&.
+.PP
+Its functions can be invoked from a single command from the command line, or it can perform multiple functions in interactive mode\&. It can operate on both
+XML
+and
+SGML
+files\&.
+.SH "OPTIONS"
+.PP
+\fBxmlcatalog\fR
+accepts the following options (in alphabetical order):
+.PP
+\fB\-\-add \fR\fB\fITYPE\fR\fR\fB \fR\fB\fIORIG\fR\fR\fB \fR\fB\fIREPLACE\fR\fR\fB \fR
+.RS 4
+Add an entry to
+CATALOGFILE\&.
+\fITYPE\fR
+indicates the type of entry\&. Possible types are:
+\fIpublic\fR, \fIsystem\fR, \fIuri\fR, \fIrewriteSystem\fR, \fIrewriteURI\fR, \fIdelegatePublic\fR, \fIdelegateSystem\fR, \fIdelegateURI\fR, \fInextCatalog\fR\&.
+\fIORIG\fR
+is the original reference to be replaced, and
+\fIREPLACE\fR
+is the
+URI
+of the replacement entity to be used\&. The
+\fB\-\-add\fR
+option will not overwrite
+CATALOGFILE, outputting to
+stdout, unless
+\fB\-\-noout\fR
+is used\&. The
+\fB\-\-add\fR
+will always take three parameters even if some of the
+XML
+catalog constructs will have only a single argument\&.
+.RE
+.PP
+\fB\-\-add \fR\fB\fIFILENAME\fR\fR
+.RS 4
+If the
+\fB\-\-add\fR
+option is used following the
+\fB\-\-sgml\fR
+option, only a single argument, a
+\fIFILENAME\fR, is used\&. This is used to add the name of a catalog file to an
+SGML
+supercatalog, a file that contains references to other included
+SGML
+catalog files\&.
+.RE
+.PP
+\fB\-\-convert\fR
+.RS 4
+Convert SGML catalog to XML\&.
+.RE
+.PP
+\fB\-\-create\fR
+.RS 4
+Create a new
+XML
+catalog\&. Outputs to
+stdout, ignoring
+\fIfilename\fR
+unless
+\fB\-\-noout\fR
+is used, in which case it creates a new catalog file
+\fIfilename\fR\&.
+.RE
+.PP
+\fB\-\-del \fR\fB\fIVALUE(S)\fR\fR
+.RS 4
+Remove entries from
+\fICATALOGFILE\fR
+matching
+\fIVALUE(S)\fR\&. The
+\fB\-\-del\fR
+option will not overwrite
+\fICATALOGFILE\fR, outputting to
+stdout, unless
+\fB\-\-noout\fR
+is used\&.
+.RE
+.PP
+\fB\-\-noout\fR
+.RS 4
+Save output to the named file rather than outputting to
+stdout\&.
+.RE
+.PP
+\fB\-\-no\-super\-update\fR
+.RS 4
+Do not update the
+SGML
+super catalog\&.
+.RE
+.PP
+\fB\-\-shell\fR
+.RS 4
+Run a shell allowing interactive queries on catalog file
+\fICATALOGFILE\fR\&. For the set of available commands see
+the section called \(lqSHELL COMMANDS\(rq\&.
+.RE
+.PP
+\fB\-\-sgml\fR
+.RS 4
+Uses
+SGML
+super catalogs for
+\fB\-\-add\fR
+and
+\fB\-\-del\fR
+options\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-verbose\fR
+.RS 4
+Output debugging information\&.
+.RE
+.PP
+Invoking
+\fBxmlcatalog\fR
+non\-interactively without a designated action (imposed with options like
+\fB\-\-add\fR) will result in a lookup of the catalog entry for
+\fIENTITIES\fR
+in the catalog denoted with
+\fICATALOGFILE\fR\&. The corresponding entries will be output to the command line\&. This mode of operation, together with
+\fB\-\-shell\fR
+mode and non\-modifying (i\&.e\&. without
+\fB\-\-noout\fR) direct actions, allows for a special shortcut of the void
+\fICATALOGFILE\fR
+specification (possibly expressed as "" in the shell environment) appointing the default system catalog\&. That simplifies the handling when its exact location is irrelevant but the respective built\-in still needs to be consulted\&.
+.SH "SHELL COMMANDS"
+.PP
+Invoking
+\fBxmlcatalog\fR
+with the
+\fB\-\-shell \fR\fB\fICATALOGFILE\fR\fR
+option opens a command line shell allowing interactive access to the catalog file identified by
+\fICATALOGFILE\fR\&. Invoking the shell provides a command line prompt after which the following commands (described in alphabetical order) can be entered\&.
+.PP
+\fBadd \fR\fB\fITYPE\fR\fR\fB \fR\fB\fIORIG\fR\fR\fB \fR\fB\fIREPLACE\fR\fR\fB \fR
+.RS 4
+Add an entry to the catalog file\&.
+\fITYPE\fR
+indicates the type of entry\&. Possible types are:
+\fIpublic\fR, \fIsystem\fR, \fIuri\fR, \fIrewriteSystem\fR, \fIrewriteURI\fR, \fIdelegatePublic\fR, \fIdelegateSystem\fR, \fIdelegateURI\fR, \fInextCatalog\fR\&.
+\fIORIG\fR
+is the original reference to be replaced, and
+\fIREPLACE\fR
+is the
+URI
+of the replacement entity to be used\&. The
+\fB\-\-add\fR
+option will not overwrite
+CATALOGFILE, outputting to
+stdout, unless
+\fB\-\-noout\fR
+is used\&. The
+\fB\-\-add\fR
+will always take three parameters even if some of the
+XML
+catalog constructs will have only a single argument\&.
+.RE
+.PP
+\fBdebug\fR
+.RS 4
+Print debugging statements showing the steps
+\fBxmlcatalog\fR
+is executing\&.
+.RE
+.PP
+\fBdel \fR\fB\fIVALUE(S)\fR\fR
+.RS 4
+Remove the catalog entry corresponding to
+\fIVALUE(S)\fR\&.
+.RE
+.PP
+\fBdump\fR
+.RS 4
+Print the current catalog\&.
+.RE
+.PP
+\fBexit\fR
+.RS 4
+Quit the shell\&.
+.RE
+.PP
+\fBpublic \fR\fB\fIPUBLIC\-ID\fR\fR
+.RS 4
+Execute a Formal Public Identifier lookup of the catalog entry for
+\fIPUBLIC\-ID\fR\&. The corresponding entry will be output to the command line\&.
+.RE
+.PP
+\fBquiet\fR
+.RS 4
+Stop printing debugging statements\&.
+.RE
+.PP
+\fBsystem \fR\fB\fISYSTEM\-ID\fR\fR
+.RS 4
+Execute a Formal Public Identifier lookup of the catalog entry for
+\fISYSTEM\-ID\fR\&. The corresponding entry will be output to the command line\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+\fBXML_CATALOG_FILES\fR
+.RS 4
+XML
+catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
+\fBXML_CATALOG_FILES\fR
+environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default catalog from
+/etc/xml/catalog
+or, more specifically,
+${sysconfdir}/xml/catalog\&.
+.RE
+.SH "DIAGNOSTICS"
+.PP
+\fBxmlcatalog\fR
+return codes provide information that can be used when calling it from scripts\&.
+.PP
+\fB0\fR
+.RS 4
+No error
+.RE
+.PP
+\fB1\fR
+.RS 4
+Failed to remove an entry from the catalog
+.RE
+.PP
+\fB2\fR
+.RS 4
+Failed to save to the catalog, check file permissions
+.RE
+.PP
+\fB3\fR
+.RS 4
+Failed to add an entry to the catalog
+.RE
+.PP
+\fB4\fR
+.RS 4
+Failed to look up an entry in the catalog
+.RE
+.SH "SEE ALSO"
+.PP
+\fBlibxml\fR(3)
+.PP
+More information can be found at
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBlibxml\fR(3)
+web page
+\m[blue]\fB\%https://gitlab.gnome.org/GNOME/libxml2\fR\m[]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBlibxml\fR(3)
+catalog support web page at
+\m[blue]\fB\%https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Catalog-support\fR\m[]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+James Clark\*(Aqs
+SGML
+catalog page
+\m[blue]\fB\%http://www.jclark.com/sp/catalog.htm\fR\m[]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+OASIS
+XML
+catalog specification
+\m[blue]\fB\%http://www.oasis-open.org/committees/entity/spec.html\fR\m[]
+.RE
+.sp
+.SH "AUTHOR"
+.PP
+\fBJohn Fleck\fR <\&jfleck@inkstain\&.net\&>
+.RS 4
+Author.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2001, 2004
+.br

local-test-libxml2-delta-01/afc-libxml2/doc/xmlcatalog.html

@@ -0,0 +1,144 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xmlcatalog</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry"><a name="idm1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xmlcatalog &#8212; 
+        Command line tool to parse and manipulate <acronym class="acronym">XML</acronym>
+        or <acronym class="acronym">SGML</acronym> catalog files.
+    </p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xmlcatalog</code>  [ <code class="option">--sgml</code>  |   <code class="option">--shell</code>  |   <code class="option">--convert</code>  |   <code class="option">--create</code>  |   <code class="option">--del <em class="replaceable"><code>VALUE(S)</code></em></code>  |   
+            [ 
+                    <code class="option">--add
+                     <em class="replaceable"><code>TYPE</code></em>
+                     <em class="replaceable"><code>ORIG</code></em>
+                     <em class="replaceable"><code>REPLACE</code></em>
+                    </code>
+                  |   <code class="option">--add <em class="replaceable"><code>FILENAME</code></em></code> ]
+          |   <code class="option">--noout</code>  |   <code class="option">--no-super-update</code>  |   
+            [ <code class="option">-v</code>  |   <code class="option">--verbose</code> ]
+         ] {<em class="replaceable"><code>CATALOGFILE</code></em>} {<em class="replaceable"><code>ENTITIES</code></em>...}</p></div></div><div class="refsect1"><a name="description"></a><h2>DESCRIPTION</h2><p>
+        <span class="command"><strong>xmlcatalog</strong></span> is a command line application allowing users to monitor and
+        manipulate <acronym class="acronym">XML</acronym> and <acronym class="acronym">SGML</acronym> catalogs. It
+        is included in <span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span>.
+    </p><p>
+        Its functions can be invoked from a single command from the command line,
+        or it can perform multiple functions in interactive mode. It can operate
+        on both <acronym class="acronym">XML</acronym> and <acronym class="acronym">SGML</acronym> files.
+    </p></div><div class="refsect1"><a name="options"></a><h2>OPTIONS</h2><p>
+        <span class="command"><strong>xmlcatalog</strong></span> accepts the following options (in alphabetical order):
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term">
+                <code class="option">--add
+                 <em class="replaceable"><code>TYPE</code></em>
+                 <em class="replaceable"><code>ORIG</code></em>
+                 <em class="replaceable"><code>REPLACE</code></em>
+                </code>
+            </span></dt><dd><p>
+                    Add an entry to <code class="filename">CATALOGFILE</code>. <em class="replaceable"><code>TYPE</code></em>
+                    indicates the type of entry. Possible types are: <span class="simplelist"><em class="parameter"><code>public</code></em>, <em class="parameter"><code>system</code></em>, <em class="parameter"><code>uri</code></em>, <em class="parameter"><code>rewriteSystem</code></em>, <em class="parameter"><code>rewriteURI</code></em>, <em class="parameter"><code>delegatePublic</code></em>, <em class="parameter"><code>delegateSystem</code></em>, <em class="parameter"><code>delegateURI</code></em>, <em class="parameter"><code>nextCatalog</code></em></span>. <em class="replaceable"><code>ORIG</code></em> is the original
+                    reference to be replaced, and <em class="replaceable"><code>REPLACE</code></em>
+                    is the <acronym class="acronym">URI</acronym> of the replacement entity to be
+                    used. The <code class="option">--add</code> option will not overwrite
+                    <code class="filename">CATALOGFILE</code>, outputting
+                    to <code class="filename">stdout</code>, unless
+                    <code class="option">--noout</code> is used. The <code class="option">--add</code> will
+                    always take three parameters even if some of the <acronym class="acronym">XML</acronym>
+                    catalog constructs will have only a single argument.
+                </p></dd><dt><span class="term"><code class="option">--add <em class="replaceable"><code>FILENAME</code></em></code></span></dt><dd><p>
+                    If the <code class="option">--add</code> option is used following
+                    the <code class="option">--sgml</code> option, only a single argument,
+                    a <em class="replaceable"><code>FILENAME</code></em>, is used. This is used to add
+                    the name of a catalog file to an <acronym class="acronym">SGML</acronym> supercatalog,
+                    a file that contains references to other included <acronym class="acronym">SGML</acronym>
+                    catalog files.
+                </p></dd><dt><span class="term"><code class="option">--convert</code></span></dt><dd><p>
+                    Convert SGML catalog to XML.
+                </p></dd><dt><span class="term"><code class="option">--create</code></span></dt><dd><p>
+                    Create a new <acronym class="acronym">XML</acronym> catalog. Outputs
+                    to <code class="filename">stdout</code>,
+                    ignoring <em class="replaceable"><code>filename</code></em> unless <code class="option">--noout</code> is
+                    used, in which case it creates a new catalog
+                    file <em class="replaceable"><code>filename</code></em>.
+                </p></dd><dt><span class="term"><code class="option">--del <em class="replaceable"><code>VALUE(S)</code></em></code></span></dt><dd><p>
+                    Remove entries from <em class="replaceable"><code>CATALOGFILE</code></em>
+                    matching <em class="replaceable"><code>VALUE(S)</code></em>. The <code class="option">--del</code>
+                    option will not overwrite <em class="replaceable"><code>CATALOGFILE</code></em>,
+                    outputting to <code class="filename">stdout</code>,
+                    unless <code class="option">--noout</code> is used.
+                </p></dd><dt><span class="term"><code class="option">--noout</code></span></dt><dd><p>
+                    Save output to the named file rather than outputting
+                    to <code class="filename">stdout</code>.
+                </p></dd><dt><span class="term"><code class="option">--no-super-update</code></span></dt><dd><p>
+                    Do not update the <acronym class="acronym">SGML</acronym> super catalog.
+                </p></dd><dt><span class="term"><code class="option">--shell</code></span></dt><dd><p>
+                    Run a shell allowing interactive queries on catalog
+                    file <em class="replaceable"><code>CATALOGFILE</code></em>. For the set of available
+                    commands see <a class="xref" href="#shell" title="SHELL COMMANDS">the section called &#8220;SHELL COMMANDS&#8221;</a>.
+                </p></dd><dt><span class="term"><code class="option">--sgml</code></span></dt><dd><p>
+                    Uses <acronym class="acronym">SGML</acronym> super catalogs for <code class="option">--add</code>
+                    and <code class="option">--del</code> options.
+                </p></dd><dt><span class="term"><code class="option">-v</code>, </span><span class="term"><code class="option">--verbose</code></span></dt><dd><p>Output debugging information.</p></dd></dl></div><p>
+        Invoking <span class="command"><strong>xmlcatalog</strong></span> non-interactively without a designated action
+        (imposed with options like <code class="option">--add</code>) will result in a lookup
+        of the catalog entry for <em class="replaceable"><code>ENTITIES</code></em> in the
+        catalog denoted with <em class="replaceable"><code>CATALOGFILE</code></em>. The
+        corresponding entries will be output to the command line. This mode of
+        operation, together with <code class="option">--shell</code> mode and non-modifying
+        (i.e. without <code class="option">--noout</code>) direct actions, allows for
+        a special shortcut of the void <em class="replaceable"><code>CATALOGFILE</code></em>
+        specification (possibly expressed as "" in the shell
+        environment) appointing the default system catalog. That simplifies the
+        handling when its exact location is irrelevant but the respective built-in
+        still needs to be consulted.
+    </p></div><div class="refsect1"><a name="shell"></a><h2>SHELL COMMANDS</h2><p>
+        Invoking <span class="command"><strong>xmlcatalog</strong></span> with
+        the <code class="option">--shell <em class="replaceable"><code>CATALOGFILE</code></em></code> option opens
+        a command line shell allowing interactive access to the catalog file
+        identified by <em class="replaceable"><code>CATALOGFILE</code></em>. Invoking the shell
+        provides a command line prompt after which the following commands (described in
+        alphabetical order) can be entered.
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term">
+                <code class="option">add
+                 <em class="replaceable"><code>TYPE</code></em>
+                 <em class="replaceable"><code>ORIG</code></em>
+                 <em class="replaceable"><code>REPLACE</code></em>
+                </code>
+            </span></dt><dd><p>
+                    Add an entry to the catalog file. <em class="replaceable"><code>TYPE</code></em>
+                    indicates the type of entry. Possible types are: <span class="simplelist"><em class="parameter"><code>public</code></em>, <em class="parameter"><code>system</code></em>, <em class="parameter"><code>uri</code></em>, <em class="parameter"><code>rewriteSystem</code></em>, <em class="parameter"><code>rewriteURI</code></em>, <em class="parameter"><code>delegatePublic</code></em>, <em class="parameter"><code>delegateSystem</code></em>, <em class="parameter"><code>delegateURI</code></em>, <em class="parameter"><code>nextCatalog</code></em></span>. <em class="replaceable"><code>ORIG</code></em> is the original
+                    reference to be replaced, and <em class="replaceable"><code>REPLACE</code></em>
+                    is the <acronym class="acronym">URI</acronym> of the replacement entity to be
+                    used. The <code class="option">--add</code> option will not overwrite
+                    <code class="filename">CATALOGFILE</code>, outputting
+                    to <code class="filename">stdout</code>, unless
+                    <code class="option">--noout</code> is used. The <code class="option">--add</code> will
+                    always take three parameters even if some of the <acronym class="acronym">XML</acronym>
+                    catalog constructs will have only a single argument.
+                </p></dd><dt><span class="term"><code class="option">debug</code></span></dt><dd><p>
+                    Print debugging statements showing the steps <span class="command"><strong>xmlcatalog</strong></span> is executing.
+                </p></dd><dt><span class="term"><code class="option">del <em class="replaceable"><code>VALUE(S)</code></em></code></span></dt><dd><p>
+                    Remove the catalog entry corresponding to <em class="replaceable"><code>VALUE(S)</code></em>.
+                </p></dd><dt><span class="term"><code class="option">dump</code></span></dt><dd><p>Print the current catalog.</p></dd><dt><span class="term"><code class="option">exit</code></span></dt><dd><p>Quit the shell.</p></dd><dt><span class="term"><code class="option">public <em class="replaceable"><code>PUBLIC-ID</code></em></code></span></dt><dd><p>
+                    Execute a Formal Public Identifier lookup of the catalog entry
+                    for <em class="replaceable"><code>PUBLIC-ID</code></em>. The corresponding entry will be
+                    output to the command line.
+                </p></dd><dt><span class="term"><code class="option">quiet</code></span></dt><dd><p>Stop printing debugging statements.</p></dd><dt><span class="term"><code class="option">system <em class="replaceable"><code>SYSTEM-ID</code></em></code></span></dt><dd><p>
+                    Execute a Formal Public Identifier lookup of the catalog entry
+                    for <em class="replaceable"><code>SYSTEM-ID</code></em>. The corresponding entry will be
+                    output to the command line.
+                </p></dd></dl></div></div><div class="refsect1"><a name="environment"></a><h2>ENVIRONMENT</h2><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="envar">XML_CATALOG_FILES</code></span></dt><dd><p><acronym class="acronym">XML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <code class="envar">XML_CATALOG_FILES</code> environment variable to a space-separated
+                    list of catalogs. Use percent-encoding to escape spaces or other characters.
+                    An empty variable should deactivate loading the default catalog from
+                    <code class="filename">/etc/xml/catalog</code> or, more specifically,
+                    <code class="filename">${sysconfdir}/xml/catalog</code>.
+                </p></dd></dl></div></div><div class="refsect1"><a name="diagnostics"></a><h2>DIAGNOSTICS</h2><p>
+        <span class="command"><strong>xmlcatalog</strong></span> return codes provide information that can be used when
+        calling it from scripts.
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span class="errorcode">0</span></span></dt><dd><p>No error</p></dd><dt><span class="term"><span class="errorcode">1</span></span></dt><dd><p>Failed to remove an entry from the catalog</p></dd><dt><span class="term"><span class="errorcode">2</span></span></dt><dd><p>Failed to save to the catalog, check file permissions</p></dd><dt><span class="term"><span class="errorcode">3</span></span></dt><dd><p>Failed to add an entry to the catalog</p></dd><dt><span class="term"><span class="errorcode">4</span></span></dt><dd><p>Failed to look up an entry in the catalog</p></dd></dl></div></div><div class="refsect1"><a name="seealso"></a><h2>SEE ALSO</h2><p><span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span>
+    </p><p>
+        More information can be found at
+        </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span> web page <a class="ulink" href="https://gitlab.gnome.org/GNOME/libxml2" target="_top">https://gitlab.gnome.org/GNOME/libxml2</a>
+                </p></li><li class="listitem"><p><span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span> catalog support web page
+                    at <a class="ulink" href="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Catalog-support" target="_top">https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Catalog-support</a>
+                </p></li><li class="listitem"><p>James Clark's <acronym class="acronym">SGML</acronym> catalog
+                    page <a class="ulink" href="http://www.jclark.com/sp/catalog.htm" target="_top">http://www.jclark.com/sp/catalog.htm</a>
+                </p></li><li class="listitem"><p><acronym class="acronym">OASIS</acronym> <acronym class="acronym">XML</acronym> catalog specification
+                    <a class="ulink" href="http://www.oasis-open.org/committees/entity/spec.html" target="_top">http://www.oasis-open.org/committees/entity/spec.html</a>
+                </p></li></ul></div><p>
+    </p></div></div></body></html>

local-test-libxml2-delta-01/afc-libxml2/doc/xmlcatalog.xml

@@ -0,0 +1,475 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"
+   href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+
+    <!ENTITY xmlcatalog "<command>xmlcatalog</command>">
+]>
+
+<refentry>
+
+<refentryinfo>
+    <title>xmlcatalog Manual</title>
+    <productname>libxml2</productname>
+    <copyright>
+        <year>2001</year>
+        <year>2004</year>
+    </copyright>
+    <author>
+        <firstname>John</firstname>
+        <surname>Fleck</surname>
+        <affiliation>
+            <address>
+                <email>jfleck@inkstain.net</email>
+            </address>
+        </affiliation>
+    </author>
+    <!-- still a bit buggy output, will talk to docbook-xsl upstream to fix this -->
+    <!-- <releaseinfo>This is release 0.3 of the xmlcatalog Manual.</releaseinfo> -->
+    <!-- <edition>0.3</edition> -->
+</refentryinfo>
+
+<refmeta>
+    <refentrytitle>xmlcatalog</refentrytitle>
+    <manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+    <refname>xmlcatalog</refname>
+    <refpurpose>
+        Command line tool to parse and manipulate <acronym>XML</acronym>
+        or <acronym>SGML</acronym> catalog files.
+    </refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+    <cmdsynopsis>
+    <command>xmlcatalog</command>
+    <group choice="opt">
+        <arg choice="plain"><option>--sgml</option></arg>
+        <arg choice="plain"><option>--shell</option></arg>
+        <arg choice="plain"><option>--convert</option></arg>
+        <arg choice="plain"><option>--create</option></arg>
+        <arg choice="plain"><option>--del <replaceable>VALUE(S)</replaceable></option></arg>
+        <arg choice="plain">
+            <group choice="opt">
+                <arg choice="plain">
+                    <option>--add
+                     <replaceable>TYPE</replaceable>
+                     <replaceable>ORIG</replaceable>
+                     <replaceable>REPLACE</replaceable>
+                    </option>
+                </arg>
+                <arg choice="plain"><option>--add <replaceable>FILENAME</replaceable></option></arg>
+            </group>
+        </arg>
+        <arg choice="plain"><option>--noout</option></arg>
+        <arg choice="plain"><option>--no-super-update</option></arg>
+        <arg choice="plain">
+            <group choice="opt">
+                <arg choice="plain"><option>-v</option></arg>
+                <arg choice="plain"><option>--verbose</option></arg>
+            </group>
+        </arg>
+    </group>
+    <arg choice="req" rep="norepeat"><replaceable>CATALOGFILE</replaceable></arg>
+    <arg choice="req" rep="repeat"><replaceable>ENTITIES</replaceable></arg>
+    </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>
+        &xmlcatalog; is a command line application allowing users to monitor and
+        manipulate <acronym>XML</acronym> and <acronym>SGML</acronym> catalogs. It
+        is included in <citerefentry>
+            <refentrytitle>libxml</refentrytitle>
+            <manvolnum>3</manvolnum>
+        </citerefentry>.
+    </para>
+    <para>
+        Its functions can be invoked from a single command from the command line,
+        or it can perform multiple functions in interactive mode. It can operate
+        on both <acronym>XML</acronym> and <acronym>SGML</acronym> files.
+    </para>
+</refsect1>
+
+<refsect1 id="options">
+    <title>OPTIONS</title>
+    <para>
+        &xmlcatalog; accepts the following options (in alphabetical order):
+    </para>
+
+    <variablelist>
+
+        <varlistentry>
+            <term>
+                <option>--add
+                 <replaceable>TYPE</replaceable>
+                 <replaceable>ORIG</replaceable>
+                 <replaceable>REPLACE</replaceable>
+                </option>
+            </term>
+            <listitem>
+                <para>
+                    Add an entry to <filename>CATALOGFILE</filename>. <replaceable>TYPE</replaceable>
+                    indicates the type of entry. Possible types are: <simplelist type="inline">
+                        <member><parameter>public</parameter></member>
+                        <member><parameter>system</parameter></member>
+                        <member><parameter>uri</parameter></member>
+                        <member><parameter>rewriteSystem</parameter></member>
+                        <member><parameter>rewriteURI</parameter></member>
+                        <member><parameter>delegatePublic</parameter></member>
+                        <member><parameter>delegateSystem</parameter></member>
+                        <member><parameter>delegateURI</parameter></member>
+                        <member><parameter>nextCatalog</parameter></member>
+                    </simplelist>. <replaceable>ORIG</replaceable> is the original
+                    reference to be replaced, and <replaceable>REPLACE</replaceable>
+                    is the <acronym>URI</acronym> of the replacement entity to be
+                    used. The <option>--add</option> option will not overwrite
+                    <filename>CATALOGFILE</filename>, outputting
+                    to <filename class="devicefile">stdout</filename>, unless
+                    <option>--noout</option> is used. The <option>--add</option> will
+                    always take three parameters even if some of the <acronym>XML</acronym>
+                    catalog constructs will have only a single argument.
+                </para>
+                <!--
+                    FIXME - Is my list of possible types correct? Are SGML types the same?
+                -->
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--add <replaceable>FILENAME</replaceable></option></term>
+            <listitem>
+                <para>
+                    If the <option>--add</option> option is used following
+                    the <option>--sgml</option> option, only a single argument,
+                    a <replaceable>FILENAME</replaceable>, is used. This is used to add
+                    the name of a catalog file to an <acronym>SGML</acronym> supercatalog,
+                    a file that contains references to other included <acronym>SGML</acronym>
+                    catalog files.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--convert</option></term>
+            <listitem>
+                <para>
+                    Convert SGML catalog to XML.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--create</option></term>
+            <listitem>
+                <para>
+                    Create a new <acronym>XML</acronym> catalog. Outputs
+                    to <filename class="devicefile">stdout</filename>,
+                    ignoring <replaceable>filename</replaceable> unless <option>--noout</option> is
+                    used, in which case it creates a new catalog
+                    file <replaceable>filename</replaceable>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--del <replaceable>VALUE(S)</replaceable></option></term>
+            <listitem>
+                <para>
+                    Remove entries from <replaceable>CATALOGFILE</replaceable>
+                    matching <replaceable>VALUE(S)</replaceable>. The <option>--del</option>
+                    option will not overwrite <replaceable>CATALOGFILE</replaceable>,
+                    outputting to <filename class="devicefile">stdout</filename>,
+                    unless <option>--noout</option> is used.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noout</option></term>
+            <listitem>
+                <para>
+                    Save output to the named file rather than outputting
+                    to <filename class="devicefile">stdout</filename>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--no-super-update</option></term>
+            <listitem>
+                <para>
+                    Do not update the <acronym>SGML</acronym> super catalog.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--shell</option></term>
+            <listitem>
+                <para>
+                    Run a shell allowing interactive queries on catalog
+                    file <replaceable>CATALOGFILE</replaceable>. For the set of available
+                    commands see <xref linkend="shell"/>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--sgml</option></term>
+            <listitem>
+                <para>
+                    Uses <acronym>SGML</acronym> super catalogs for <option>--add</option>
+                    and <option>--del</option> options.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>-v</option></term>
+            <term><option>--verbose</option></term>
+            <listitem>
+                <para>Output debugging information.</para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+
+    <para>
+        Invoking &xmlcatalog; non-interactively without a designated action
+        (imposed with options like <option>--add</option>) will result in a lookup
+        of the catalog entry for <replaceable>ENTITIES</replaceable> in the
+        catalog denoted with <replaceable>CATALOGFILE</replaceable>. The
+        corresponding entries will be output to the command line. This mode of
+        operation, together with <option>--shell</option> mode and non-modifying
+        (i.e. without <option>--noout</option>) direct actions, allows for
+        a special shortcut of the void <replaceable>CATALOGFILE</replaceable>
+        specification (possibly expressed as &quot;&quot; in the shell
+        environment) appointing the default system catalog. That simplifies the
+        handling when its exact location is irrelevant but the respective built-in
+        still needs to be consulted.
+    </para>
+</refsect1>
+
+<refsect1 id="shell">
+    <title>SHELL COMMANDS</title>
+    <para>
+        Invoking &xmlcatalog; with
+        the <option>--shell <replaceable>CATALOGFILE</replaceable></option> option opens
+        a command line shell allowing interactive access to the catalog file
+        identified by <replaceable>CATALOGFILE</replaceable>. Invoking the shell
+        provides a command line prompt after which the following commands (described in
+        alphabetical order) can be entered.
+    </para>
+
+    <variablelist>
+
+        <varlistentry>
+            <term>
+                <option>add
+                 <replaceable>TYPE</replaceable>
+                 <replaceable>ORIG</replaceable>
+                 <replaceable>REPLACE</replaceable>
+                </option>
+            </term>
+            <listitem>
+                <para>
+                    Add an entry to the catalog file. <replaceable>TYPE</replaceable>
+                    indicates the type of entry. Possible types are: <simplelist type="inline">
+                        <member><parameter>public</parameter></member>
+                        <member><parameter>system</parameter></member>
+                        <member><parameter>uri</parameter></member>
+                        <member><parameter>rewriteSystem</parameter></member>
+                        <member><parameter>rewriteURI</parameter></member>
+                        <member><parameter>delegatePublic</parameter></member>
+                        <member><parameter>delegateSystem</parameter></member>
+                        <member><parameter>delegateURI</parameter></member>
+                        <member><parameter>nextCatalog</parameter></member>
+                    </simplelist>. <replaceable>ORIG</replaceable> is the original
+                    reference to be replaced, and <replaceable>REPLACE</replaceable>
+                    is the <acronym>URI</acronym> of the replacement entity to be
+                    used. The <option>--add</option> option will not overwrite
+                    <filename>CATALOGFILE</filename>, outputting
+                    to <filename class="devicefile">stdout</filename>, unless
+                    <option>--noout</option> is used. The <option>--add</option> will
+                    always take three parameters even if some of the <acronym>XML</acronym>
+                    catalog constructs will have only a single argument.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>debug</option></term>
+            <listitem>
+                <para>
+                    Print debugging statements showing the steps &xmlcatalog; is executing.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>del <replaceable>VALUE(S)</replaceable></option></term>
+            <listitem>
+                <para>
+                    Remove the catalog entry corresponding to <replaceable>VALUE(S)</replaceable>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>dump</option></term>
+            <listitem>
+                <para>Print the current catalog.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>exit</option></term>
+            <listitem>
+                <para>Quit the shell.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>public <replaceable>PUBLIC-ID</replaceable></option></term>
+            <listitem>
+                <para>
+                    Execute a Formal Public Identifier lookup of the catalog entry
+                    for <replaceable>PUBLIC-ID</replaceable>. The corresponding entry will be
+                    output to the command line.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>quiet</option></term>
+            <listitem>
+                <para>Stop printing debugging statements.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>system <replaceable>SYSTEM-ID</replaceable></option></term>
+            <listitem>
+                <para>
+                    Execute a Formal Public Identifier lookup of the catalog entry
+                    for <replaceable>SYSTEM-ID</replaceable>. The corresponding entry will be
+                    output to the command line.
+                </para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="environment">
+    <title>ENVIRONMENT</title>
+    <variablelist>
+
+        <varlistentry>
+            <term><envar>XML_CATALOG_FILES</envar></term>
+            <listitem>
+                <para><acronym>XML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <envar>XML_CATALOG_FILES</envar> environment variable to a space-separated
+                    list of catalogs. Use percent-encoding to escape spaces or other characters.
+                    An empty variable should deactivate loading the default catalog from
+                    <filename>/etc/xml/catalog</filename> or, more specifically,
+                    <filename>${sysconfdir}/xml/catalog</filename>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="diagnostics">
+    <title>DIAGNOSTICS</title>
+    <para>
+        &xmlcatalog; return codes provide information that can be used when
+        calling it from scripts.
+    </para>
+    <variablelist>
+
+        <varlistentry>
+            <term><errorcode>0</errorcode></term>
+            <listitem>
+                <para>No error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>1</errorcode></term>
+            <listitem>
+                <para>Failed to remove an entry from the catalog</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>2</errorcode></term>
+            <listitem>
+                <para>Failed to save to the catalog, check file permissions</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>3</errorcode></term>
+            <listitem>
+                <para>Failed to add an entry to the catalog</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>4</errorcode></term>
+            <listitem>
+                <para>Failed to look up an entry in the catalog</para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="seealso">
+    <title>SEE ALSO</title>
+    <para><citerefentry>
+            <refentrytitle>libxml</refentrytitle>
+            <manvolnum>3</manvolnum>
+        </citerefentry>
+    </para>
+    <para>
+        More information can be found at
+        <itemizedlist>
+            <listitem>
+                <para><citerefentry>
+                        <refentrytitle>libxml</refentrytitle>
+                        <manvolnum>3</manvolnum>
+                    </citerefentry> web page <ulink url="https://gitlab.gnome.org/GNOME/libxml2"/>
+                </para>
+            </listitem>
+            <listitem>
+                <para><citerefentry>
+                        <refentrytitle>libxml</refentrytitle>
+                        <manvolnum>3</manvolnum>
+                    </citerefentry> catalog support web page
+                    at <ulink url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Catalog-support"/>
+                </para>
+            </listitem>
+            <listitem>
+                <para>James Clark's <acronym>SGML</acronym> catalog
+                    page <ulink url="http://www.jclark.com/sp/catalog.htm"/>
+                </para>
+            </listitem>
+            <listitem>
+                <para><acronym>OASIS</acronym> <acronym>XML</acronym> catalog specification
+                    <ulink url="http://www.oasis-open.org/committees/entity/spec.html"/>
+                </para>
+            </listitem>
+        </itemizedlist>
+    </para>
+</refsect1>
+
+</refentry>

local-test-libxml2-delta-01/afc-libxml2/doc/xmllint.1

@@ -0,0 +1,642 @@
+'\" t
+.\"     Title: xmllint
+.\"    Author: John Fleck <jfleck@inkstain.net>
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 06/12/2024
+.\"    Manual: xmllint Manual
+.\"    Source: libxml2
+.\"  Language: English
+.\"
+.TH "XMLLINT" "1" "06/12/2024" "libxml2" "xmllint Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+xmllint \- command line XML tool
+.SH "SYNOPSIS"
+.HP \w'\fBxmllint\fR\ 'u
+\fBxmllint\fR [\fB\-\-version\fR | \fB\-\-debug\fR | \fB\-\-quiet\fR | \fB\-\-shell\fR | \fB\-\-xpath\ "\fR\fB\fIXPath_expression\fR\fR\fB"\fR | \fB\-\-debugent\fR | \fB\-\-copy\fR | \fB\-\-recover\fR | \fB\-\-nodict\fR | \fB\-\-noent\fR | \fB\-\-noout\fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-htmlout\fR | \fB\-\-nowrap\fR | \fB\-\-valid\fR | \fB\-\-postvalid\fR | \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR | \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR | \fB\-\-timing\fR | \fB\-\-output\ \fR\fB\fIFILE\fR\fR | \fB\-\-repeat\fR | \fB\-\-insert\fR | \fB\-\-compress\fR | \fB\-\-html\fR | \fB\-\-xmlout\fR | \fB\-\-push\fR | \fB\-\-memory\fR | \fB\-\-max\-ampl\ \fR\fB\fIINTEGER\fR\fR | \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR | \fB\-\-nowarning\fR | \fB\-\-noblanks\fR | \fB\-\-nocdata\fR | \fB\-\-format\fR | \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR | \fB\-\-dropdtd\fR | \fB\-\-nsclean\fR | \fB\-\-testIO\fR | \fB\-\-catalogs\fR | \fB\-\-nocatalogs\fR | \fB\-\-auto\fR | \fB\-\-xinclude\fR | \fB\-\-noxincludenode\fR | \fB\-\-loaddtd\fR | \fB\-\-dtdattr\fR | \fB\-\-stream\fR | \fB\-\-walker\fR | \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR | \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-c14n\fR | \fB\-\-pedantic\fR] {\fIXML\-FILE(S)\fR... | \-}
+.HP \w'\fBxmllint\fR\ 'u
+\fBxmllint\fR \fB\-\-help\fR
+.SH "DESCRIPTION"
+.PP
+The
+\fBxmllint\fR
+program parses one or more
+XML
+files, specified on the command line as
+\fIXML\-FILE\fR
+(or the standard input if the filename provided is
+\fB\-\fR
+)\&. It prints various types of output, depending upon the options selected\&. It is useful for detecting errors both in
+XML
+code and in the
+XML
+parser itself\&.
+.PP
+\fBxmllint\fR
+is included in
+\fBlibxml\fR(3)\&.
+.SH "OPTIONS"
+.PP
+\fBxmllint\fR
+accepts the following options (in alphabetical order):
+.PP
+\fB\-\-auto\fR
+.RS 4
+Generate a small document for testing purposes\&.
+.RE
+.PP
+\fB\-\-catalogs\fR
+.RS 4
+Use the
+SGML
+catalog(s) from
+\fBSGML_CATALOG_FILES\fR\&. Otherwise
+XML
+catalogs starting from
+/etc/xml/catalog
+or, more specifically,
+${sysconfdir}/xml/catalog
+are used by default\&.
+.RE
+.PP
+\fB\-\-compress\fR
+.RS 4
+Turn on
+\fBgzip\fR(1)
+compression of output\&.
+.RE
+.PP
+\fB\-\-copy\fR
+.RS 4
+Test the internal copy implementation\&.
+.RE
+.PP
+\fB\-\-c14n\fR
+.RS 4
+Use the W3C
+XML
+Canonicalisation (C14N) to serialize the result of parsing to
+stdout\&. It keeps comments in the result\&.
+.RE
+.PP
+\fB\-\-dtdvalid \fR\fB\fIURL\fR\fR
+.RS 4
+Use the
+DTD
+specified by an
+\fIURL\fR
+for validation\&.
+.RE
+.PP
+\fB\-\-dtdvalidfpi \fR\fB\fIFPI\fR\fR
+.RS 4
+Use the
+DTD
+specified by a Formal Public Identifier
+\fIFPI\fR
+for validation, note that this will require a catalog exporting that Formal Public Identifier to work\&.
+.RE
+.PP
+\fB\-\-debug\fR
+.RS 4
+Parse a file and output an annotated tree of the in\-memory version of the document\&.
+.RE
+.PP
+\fB\-\-debugent\fR
+.RS 4
+Debug the entities defined in the document\&.
+.RE
+.PP
+\fB\-\-dropdtd\fR
+.RS 4
+Remove
+DTD
+from output\&.
+.RE
+.PP
+\fB\-\-dtdattr\fR
+.RS 4
+Fetch external
+DTD
+and populate the tree with inherited attributes\&.
+.RE
+.PP
+\fB\-\-encode \fR\fB\fIENCODING\fR\fR
+.RS 4
+Output in the given encoding\&. Note that this works for full document not fragments or result from XPath queries\&.
+.RE
+.PP
+\fB\-\-format\fR
+.RS 4
+Reformat and reindent the output\&. The
+\fBXMLLINT_INDENT\fR
+environment variable controls the indentation\&. The default value is two spaces " ")\&.
+.RE
+.PP
+\fB\-\-help\fR
+.RS 4
+Print out a short usage summary for
+\fBxmllint\fR\&.
+.RE
+.PP
+\fB\-\-html\fR
+.RS 4
+Use the
+HTML
+parser\&.
+.RE
+.PP
+\fB\-\-htmlout\fR
+.RS 4
+Output results as an
+HTML
+file\&. This causes
+\fBxmllint\fR
+to output the necessary
+HTML
+tags surrounding the result tree output so the results can be displayed/viewed in a browser\&.
+.RE
+.PP
+\fB\-\-insert\fR
+.RS 4
+Test for valid insertions\&.
+.RE
+.PP
+\fB\-\-loaddtd\fR
+.RS 4
+Fetch an external
+DTD\&.
+.RE
+.PP
+\fB\-\-load\-trace\fR
+.RS 4
+Display all the documents loaded during the processing to
+stderr\&.
+.RE
+.PP
+\fB\-\-max\-ampl \fR\fB\fIINTEGER\fR\fR
+.RS 4
+Set the maximum amplification factor which protects against exponential entity expansion ("billion laughs")\&. The default value is 5\&. Documents making heavy use of entity expansion may require a higher value\&.
+.RE
+.PP
+\fB\-\-maxmem \fR\fB\fINNBYTES\fR\fR
+.RS 4
+Test the parser memory support\&.
+\fINNBYTES\fR
+is the maximum number of bytes the library is allowed to allocate\&. This can also be used to make sure batch processing of
+XML
+files will not exhaust the virtual memory of the server running them\&.
+.RE
+.PP
+\fB\-\-memory\fR
+.RS 4
+Parse from memory\&.
+.RE
+.PP
+\fB\-\-noblanks\fR
+.RS 4
+Drop ignorable blank spaces\&.
+.RE
+.PP
+\fB\-\-nocatalogs\fR
+.RS 4
+Do not use any catalogs\&.
+.RE
+.PP
+\fB\-\-nocdata\fR
+.RS 4
+Substitute CDATA section by equivalent text nodes\&.
+.RE
+.PP
+\fB\-\-nodict\fR
+.RS 4
+Don\*(Aqt use dictionaries (parser option XML_PARSE_NODICT)\&. Only for debugging\&.
+.RE
+.PP
+\fB\-\-noent\fR
+.RS 4
+Substitute entity values for entity references\&. By default,
+\fBxmllint\fR
+leaves entity references in place\&.
+.RE
+.PP
+\fB\-\-nonet\fR
+.RS 4
+Do not use the Internet to fetch
+DTDs or entities\&.
+.RE
+.PP
+\fB\-\-noout\fR
+.RS 4
+Suppress output\&. By default,
+\fBxmllint\fR
+outputs the result tree\&.
+.RE
+.PP
+\fB\-\-nowarning\fR
+.RS 4
+Do not emit warnings from the parser and/or validator\&.
+.RE
+.PP
+\fB\-\-nowrap\fR
+.RS 4
+Do not output
+HTML
+doc wrapper\&.
+.RE
+.PP
+\fB\-\-noxincludenode\fR
+.RS 4
+Do XInclude processing but do not generate XInclude start and end nodes\&.
+.RE
+.PP
+\fB\-\-nsclean\fR
+.RS 4
+Remove redundant namespace declarations\&.
+.RE
+.PP
+\fB\-\-output \fR\fB\fIFILE\fR\fR
+.RS 4
+Define a file path where
+\fBxmllint\fR
+will save the result of parsing\&. Usually the programs build a tree and save it on
+stdout, with this option the result
+XML
+instance will be saved onto a file\&.
+.RE
+.PP
+\fB\-\-path "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
+.RS 4
+Use the (space\- or colon\-separated) list of filesystem paths specified by
+\fIPATHS\fR
+to load
+DTDs or entities\&. Enclose space\-separated lists by quotation marks\&.
+.RE
+.PP
+\fB\-\-pattern \fR\fB\fIPATTERNVALUE\fR\fR
+.RS 4
+Used to exercise the pattern recognition engine, which can be used with the reader interface to the parser\&. It allows to select some nodes in the document based on an XPath (subset) expression\&. Used for debugging\&.
+.RE
+.PP
+\fB\-\-pedantic\fR
+.RS 4
+Enable additional warnings\&.
+.RE
+.PP
+\fB\-\-postvalid\fR
+.RS 4
+Validate after parsing has completed\&.
+.RE
+.PP
+\fB\-\-push\fR
+.RS 4
+Use the push mode of the parser\&.
+.RE
+.PP
+\fB\-\-quiet\fR
+.RS 4
+Don\*(Aqt print informational messages to stderr\&.
+.RE
+.PP
+\fB\-\-recover\fR
+.RS 4
+Output any parsable portions of an invalid document\&.
+.RE
+.PP
+\fB\-\-relaxng \fR\fB\fISCHEMA\fR\fR
+.RS 4
+Use RelaxNG file named
+\fISCHEMA\fR
+for validation\&.
+.RE
+.PP
+\fB\-\-repeat\fR
+.RS 4
+Repeat 100 times, for timing or profiling\&.
+.RE
+.PP
+\fB\-\-schema \fR\fB\fISCHEMA\fR\fR
+.RS 4
+Use a W3C
+XML
+Schema file named
+\fISCHEMA\fR
+for validation\&.
+.RE
+.PP
+\fB\-\-shell\fR
+.RS 4
+Run a navigating shell\&. Details on available commands in shell mode are below (see
+the section called \(lqSHELL COMMANDS\(rq)\&.
+.RE
+.PP
+\fB\-\-xpath "\fR\fB\fIXPath_expression\fR\fR\fB"\fR
+.RS 4
+Run an XPath expression given as argument and print the result\&. In case of a nodeset result, each node in the node set is serialized in full in the output\&. In case of an empty node set the "XPath set is empty" result will be shown and exit code 11 will be returned\&.\&. This feature is EXPERIMENTAL\&. Implementation details can change without futher notice\&.
+.RE
+.PP
+\fB\-\-stream\fR
+.RS 4
+Use streaming
+API
+\- useful when used in combination with
+\fB\-\-relaxng\fR
+or
+\fB\-\-valid\fR
+options for validation of files that are too large to be held in memory\&.
+.RE
+.PP
+\fB\-\-testIO\fR
+.RS 4
+Test user input/output support\&.
+.RE
+.PP
+\fB\-\-timing\fR
+.RS 4
+Output information about the time it takes
+\fBxmllint\fR
+to perform the various steps\&.
+.RE
+.PP
+\fB\-\-valid\fR
+.RS 4
+Determine if the document is a valid instance of the included Document Type Definition (DTD)\&. A
+DTD
+to be validated against also can be specified at the command line using the
+\fB\-\-dtdvalid\fR
+option\&. By default,
+\fBxmllint\fR
+also checks to determine if the document is well\-formed\&.
+.RE
+.PP
+\fB\-\-version\fR
+.RS 4
+Display the version of
+\fBlibxml\fR(3)
+used\&.
+.RE
+.PP
+\fB\-\-walker\fR
+.RS 4
+Test the walker module, which is a reader interface but for a document tree, instead of using the reader
+API
+on an unparsed document it works on an existing in\-memory tree\&. Used for debugging\&.
+.RE
+.PP
+\fB\-\-xinclude\fR
+.RS 4
+Do XInclude processing\&.
+.RE
+.PP
+\fB\-\-xmlout\fR
+.RS 4
+Used in conjunction with
+\fB\-\-html\fR\&. Usually when
+HTML
+is parsed the document is saved with the
+HTML
+serializer\&. But with this option the resulting document is saved with the
+XML
+serializer\&. This is primarily used to generate
+XHTML
+from
+HTML
+input\&.
+.RE
+.SH "SHELL COMMANDS"
+.PP
+\fBxmllint\fR
+offers an interactive shell mode invoked with the
+\fB\-\-shell\fR
+command\&. Available commands in shell mode include (in alphabetical order):
+.PP
+\fBbase\fR
+.RS 4
+Display
+XML
+base of the node\&.
+.RE
+.PP
+\fBbye\fR
+.RS 4
+Leave the shell\&.
+.RE
+.PP
+\fBcat \fR\fB\fINODE\fR\fR
+.RS 4
+Display the given node or the current one\&.
+.RE
+.PP
+\fBcd \fR\fB\fIPATH\fR\fR
+.RS 4
+Change the current node to the given path (if unique) or root if no argument is given\&.
+.RE
+.PP
+\fBdir \fR\fB\fIPATH\fR\fR
+.RS 4
+Dumps information about the node (namespace, attributes, content)\&.
+.RE
+.PP
+\fBdu \fR\fB\fIPATH\fR\fR
+.RS 4
+Show the structure of the subtree under the given path or the current node\&.
+.RE
+.PP
+\fBexit\fR
+.RS 4
+Leave the shell\&.
+.RE
+.PP
+\fBhelp\fR
+.RS 4
+Show this help\&.
+.RE
+.PP
+\fBload \fR\fB\fIFILENAME\fR\fR
+.RS 4
+Load a new document with the given filename\&.
+.RE
+.PP
+\fBls \fR\fB\fIPATH\fR\fR
+.RS 4
+List contents of the given path or the current directory\&.
+.RE
+.PP
+\fBpwd\fR
+.RS 4
+Display the path to the current node\&.
+.RE
+.PP
+\fBquit\fR
+.RS 4
+Leave the shell\&.
+.RE
+.PP
+\fBsave \fR\fB\fIFILENAME\fR\fR
+.RS 4
+Save the current document to the given filename or to the original name\&.
+.RE
+.PP
+\fBvalidate\fR
+.RS 4
+Check the document for errors\&.
+.RE
+.PP
+\fBwrite \fR\fB\fIFILENAME\fR\fR
+.RS 4
+Write the current node to the given filename\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+\fBSGML_CATALOG_FILES\fR
+.RS 4
+SGML
+catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
+\fBSGML_CATALOG_FILES\fR
+environment variable to a list of catalogs\&. An empty one should deactivate loading the default catalog\&.
+.RE
+.PP
+\fBXML_CATALOG_FILES\fR
+.RS 4
+XML
+catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
+\fBXML_CATALOG_FILES\fR
+environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default catalog\&.
+.RE
+.PP
+\fBXML_DEBUG_CATALOG\fR
+.RS 4
+Setting the environment variable
+\fBXML_DEBUG_CATALOG\fR
+to
+\fInon\-zero\fR
+using the
+\fBexport\fR
+command outputs debugging information related to catalog operations\&.
+.RE
+.PP
+\fBXMLLINT_INDENT\fR
+.RS 4
+Setting the environment variable
+\fBXMLLINT_INDENT\fR
+controls the indentation\&. The default value is two spaces " "\&.
+.RE
+.SH "DIAGNOSTICS"
+.PP
+\fBxmllint\fR
+return codes provide information that can be used when calling it from scripts\&.
+.PP
+\fB0\fR
+.RS 4
+No error
+.RE
+.PP
+\fB1\fR
+.RS 4
+Unclassified
+.RE
+.PP
+\fB2\fR
+.RS 4
+Error in
+DTD
+.RE
+.PP
+\fB3\fR
+.RS 4
+Validation error
+.RE
+.PP
+\fB4\fR
+.RS 4
+Validation error
+.RE
+.PP
+\fB5\fR
+.RS 4
+Error in schema compilation
+.RE
+.PP
+\fB6\fR
+.RS 4
+Error writing output
+.RE
+.PP
+\fB7\fR
+.RS 4
+Error in pattern (generated when
+\fB\-\-pattern\fR
+option is used)
+.RE
+.PP
+\fB9\fR
+.RS 4
+Out of memory error
+.RE
+.PP
+\fB10\fR
+.RS 4
+XPath evaluation error
+.RE
+.PP
+\fB11\fR
+.RS 4
+XPath result is empty
+.RE
+.SH "SEE ALSO"
+.PP
+\fBlibxml\fR(3)
+.PP
+More information can be found at
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBlibxml\fR(3)
+web page
+\m[blue]\fB\%https://gitlab.gnome.org/GNOME/libxml2\fR\m[]
+.RE
+.sp
+.SH "AUTHORS"
+.PP
+\fBJohn Fleck\fR <\&jfleck@inkstain\&.net\&>
+.RS 4
+Author.
+.RE
+.PP
+\fBZiying Sherwin\fR <\&sherwin@nlm\&.nih\&.gov\&>
+.RS 4
+Author.
+.RE
+.PP
+\fBHeiko Rupp\fR <\&hwr@pilhuhn\&.de\&>
+.RS 4
+Author.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2001, 2004
+.br

local-test-libxml2-delta-01/afc-libxml2/doc/xmllint.html

@@ -0,0 +1,167 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xmllint</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry"><a name="idm1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xmllint &#8212; command line <acronym class="acronym">XML</acronym> tool</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xmllint</code>  [ <code class="option">--version</code>  |   <code class="option">--debug</code>  |   <code class="option">--quiet</code>  |   <code class="option">--shell</code>  |   <code class="option">--xpath "<em class="replaceable"><code>XPath_expression</code></em>"</code>  |   <code class="option">--debugent</code>  |   <code class="option">--copy</code>  |   <code class="option">--recover</code>  |   <code class="option">--nodict</code>  |   <code class="option">--noent</code>  |   <code class="option">--noout</code>  |   <code class="option">--nonet</code>  |   <code class="option">--path "<em class="replaceable"><code>PATH(S)</code></em>"</code>  |   <code class="option">--load-trace</code>  |   <code class="option">--htmlout</code>  |   <code class="option">--nowrap</code>  |   <code class="option">--valid</code>  |   <code class="option">--postvalid</code>  |   <code class="option">--dtdvalid <em class="replaceable"><code>URL</code></em></code>  |   <code class="option">--dtdvalidfpi <em class="replaceable"><code>FPI</code></em></code>  |   <code class="option">--timing</code>  |   <code class="option">--output <em class="replaceable"><code>FILE</code></em></code>  |   <code class="option">--repeat</code>  |   <code class="option">--insert</code>  |   <code class="option">--compress</code>  |   <code class="option">--html</code>  |   <code class="option">--xmlout</code>  |   <code class="option">--push</code>  |   <code class="option">--memory</code>  |   <code class="option">--max-ampl <em class="replaceable"><code>INTEGER</code></em></code>  |   <code class="option">--maxmem <em class="replaceable"><code>NBBYTES</code></em></code>  |   <code class="option">--nowarning</code>  |   <code class="option">--noblanks</code>  |   <code class="option">--nocdata</code>  |   <code class="option">--format</code>  |   <code class="option">--encode <em class="replaceable"><code>ENCODING</code></em></code>  |   <code class="option">--dropdtd</code>  |   <code class="option">--nsclean</code>  |   <code class="option">--testIO</code>  |   <code class="option">--catalogs</code>  |   <code class="option">--nocatalogs</code>  |   <code class="option">--auto</code>  |   <code class="option">--xinclude</code>  |   <code class="option">--noxincludenode</code>  |   <code class="option">--loaddtd</code>  |   <code class="option">--dtdattr</code>  |   <code class="option">--stream</code>  |   <code class="option">--walker</code>  |   <code class="option">--pattern <em class="replaceable"><code>PATTERNVALUE</code></em></code>  |   <code class="option">--relaxng <em class="replaceable"><code>SCHEMA</code></em></code>  |   <code class="option">--schema <em class="replaceable"><code>SCHEMA</code></em></code>  |   <code class="option">--c14n</code>  |   <code class="option">--pedantic</code> ] { <em class="replaceable"><code>XML-FILE(S)</code></em>...  |   - }</p></div><div class="cmdsynopsis"><p><code class="command">xmllint</code>   <code class="option">--help</code> </p></div></div><div class="refsect1"><a name="description"></a><h2>DESCRIPTION</h2><p>
+        The <span class="command"><strong>xmllint</strong></span> program parses one or more <acronym class="acronym">XML</acronym> files,
+        specified on the command line as <em class="replaceable"><code>XML-FILE</code></em>
+        (or the standard input if the filename provided
+        is <span class="bold"><strong>-</strong></span> ). It prints various types of
+        output, depending upon the options selected. It is useful for detecting
+        errors both in <acronym class="acronym">XML</acronym> code and in
+        the <acronym class="acronym">XML</acronym> parser itself.
+    </p><p><span class="command"><strong>xmllint</strong></span> is included in <span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span>.</p></div><div class="refsect1"><a name="options"></a><h2>OPTIONS</h2><p>
+        <span class="command"><strong>xmllint</strong></span> accepts the following options (in alphabetical order):
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">--auto</code></span></dt><dd><p>Generate a small document for testing purposes.</p></dd><dt><span class="term"><code class="option">--catalogs</code></span></dt><dd><p>
+                    Use the <acronym class="acronym">SGML</acronym> catalog(s) from <code class="envar">SGML_CATALOG_FILES</code>.
+                    Otherwise <acronym class="acronym">XML</acronym> catalogs starting
+                    from <code class="filename">/etc/xml/catalog</code> or, more specifically,
+                    <code class="filename">${sysconfdir}/xml/catalog</code> are used by default.
+                </p></dd><dt><span class="term"><code class="option">--compress</code></span></dt><dd><p>
+                    Turn on <span class="citerefentry"><span class="refentrytitle">gzip</span>(1)</span> compression of output.
+                </p></dd><dt><span class="term"><code class="option">--copy</code></span></dt><dd><p>Test the internal copy implementation.</p></dd><dt><span class="term"><code class="option">--c14n</code></span></dt><dd><p>
+                    Use the W3C <acronym class="acronym">XML</acronym> Canonicalisation (<acronym class="acronym">C14N</acronym>) to
+                    serialize the result of parsing to <code class="filename">stdout</code>.
+                    It keeps comments in the result.
+                </p></dd><dt><span class="term"><code class="option">--dtdvalid <em class="replaceable"><code>URL</code></em></code></span></dt><dd><p>
+                    Use the <acronym class="acronym">DTD</acronym> specified by
+                    an <em class="replaceable"><code>URL</code></em> for validation.
+                </p></dd><dt><span class="term"><code class="option">--dtdvalidfpi <em class="replaceable"><code>FPI</code></em></code></span></dt><dd><p>
+                    Use the <acronym class="acronym">DTD</acronym> specified by a Formal Public
+                    Identifier <em class="replaceable"><code>FPI</code></em> for validation, note that this
+                    will require a catalog exporting that Formal Public Identifier to work.
+                </p></dd><dt><span class="term"><code class="option">--debug</code></span></dt><dd><p>
+                    Parse a file and output an annotated tree of the
+                    in-memory version of the document.
+                </p></dd><dt><span class="term"><code class="option">--debugent</code></span></dt><dd><p>Debug the entities defined in the document.</p></dd><dt><span class="term"><code class="option">--dropdtd</code></span></dt><dd><p>Remove <acronym class="acronym">DTD</acronym> from output.</p></dd><dt><span class="term"><code class="option">--dtdattr</code></span></dt><dd><p>
+                    Fetch external <acronym class="acronym">DTD</acronym> and populate the tree with
+                    inherited attributes.
+                </p></dd><dt><span class="term"><code class="option">--encode <em class="replaceable"><code>ENCODING</code></em></code></span></dt><dd><p>Output in the given encoding. Note that this works for full document not fragments or result from XPath queries.</p></dd><dt><span class="term"><code class="option">--format</code></span></dt><dd><p>
+                    Reformat and reindent the output. The <code class="envar">XMLLINT_INDENT</code>
+                    environment variable controls the indentation. The default value is two
+                    spaces "  ").
+                </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd><p>Print out a short usage summary for <span class="command"><strong>xmllint</strong></span>.</p></dd><dt><span class="term"><code class="option">--html</code></span></dt><dd><p>Use the <acronym class="acronym">HTML</acronym> parser.</p></dd><dt><span class="term"><code class="option">--htmlout</code></span></dt><dd><p>
+                    Output results as an <acronym class="acronym">HTML</acronym> file. This
+                    causes <span class="command"><strong>xmllint</strong></span> to output the necessary <acronym class="acronym">HTML</acronym>
+                    tags surrounding the result tree output so the results can be
+                    displayed/viewed in a browser.
+                </p></dd><dt><span class="term"><code class="option">--insert</code></span></dt><dd><p>Test for valid insertions.</p></dd><dt><span class="term"><code class="option">--loaddtd</code></span></dt><dd><p>Fetch an external <acronym class="acronym">DTD</acronym>.</p></dd><dt><span class="term"><code class="option">--load-trace</code></span></dt><dd><p>
+                    Display all the documents loaded during the processing
+                    to <code class="filename">stderr</code>.
+                </p></dd><dt><span class="term"><code class="option">--max-ampl <em class="replaceable"><code>INTEGER</code></em></code></span></dt><dd><p>
+                    Set the maximum amplification factor which protects against
+                    exponential entity expansion ("billion laughs"). The default value
+                    is 5. Documents making heavy use of entity expansion may require a
+                    higher value.
+                </p></dd><dt><span class="term"><code class="option">--maxmem <em class="replaceable"><code>NNBYTES</code></em></code></span></dt><dd><p>
+                    Test the parser memory support. <em class="replaceable"><code>NNBYTES</code></em>
+                    is the maximum number of bytes the library is allowed to allocate.
+                    This can also be used to make sure batch processing
+                    of <acronym class="acronym">XML</acronym> files will not exhaust the virtual memory
+                    of the server running them.
+                </p></dd><dt><span class="term"><code class="option">--memory</code></span></dt><dd><p>Parse from memory.</p></dd><dt><span class="term"><code class="option">--noblanks</code></span></dt><dd><p>Drop ignorable blank spaces.</p></dd><dt><span class="term"><code class="option">--nocatalogs</code></span></dt><dd><p>Do not use any catalogs.</p></dd><dt><span class="term"><code class="option">--nocdata</code></span></dt><dd><p>Substitute CDATA section by equivalent text nodes.</p></dd><dt><span class="term"><code class="option">--nodict</code></span></dt><dd><p>
+                    Don't use dictionaries (parser option XML_PARSE_NODICT).
+                    Only for debugging.
+                </p></dd><dt><span class="term"><code class="option">--noent</code></span></dt><dd><p>
+                    Substitute entity values for entity references. By default, <span class="command"><strong>xmllint</strong></span>
+                    leaves entity references in place.
+                </p></dd><dt><span class="term"><code class="option">--nonet</code></span></dt><dd><p>
+                    Do not use the Internet to fetch <acronym class="acronym">DTD</acronym>s or entities.
+                </p></dd><dt><span class="term"><code class="option">--noout</code></span></dt><dd><p>
+                    Suppress output. By default, <span class="command"><strong>xmllint</strong></span> outputs the result tree.
+                </p></dd><dt><span class="term"><code class="option">--nowarning</code></span></dt><dd><p>Do not emit warnings from the parser and/or validator.</p></dd><dt><span class="term"><code class="option">--nowrap</code></span></dt><dd><p>Do not output <acronym class="acronym">HTML</acronym> doc wrapper.</p></dd><dt><span class="term"><code class="option">--noxincludenode</code></span></dt><dd><p>
+                    Do XInclude processing but do not generate XInclude start and end nodes.
+                </p></dd><dt><span class="term"><code class="option">--nsclean</code></span></dt><dd><p>Remove redundant namespace declarations.</p></dd><dt><span class="term"><code class="option">--output <em class="replaceable"><code>FILE</code></em></code></span></dt><dd><p>
+                    Define a file path where <span class="command"><strong>xmllint</strong></span> will save the result of parsing.
+                    Usually the programs build a tree and save it
+                    on <code class="filename">stdout</code>, with this option
+                    the result <acronym class="acronym">XML</acronym> instance will be saved onto a file.
+                </p></dd><dt><span class="term"><code class="option">--path "<em class="replaceable"><code>PATH(S)</code></em>"</code></span></dt><dd><p>
+                    Use the (space- or colon-separated) list of filesystem paths specified
+                    by <em class="replaceable"><code>PATHS</code></em> to load <acronym class="acronym">DTD</acronym>s or
+                    entities. Enclose space-separated lists by quotation marks.
+                </p></dd><dt><span class="term"><code class="option">--pattern <em class="replaceable"><code>PATTERNVALUE</code></em></code></span></dt><dd><p>
+                    Used to exercise the pattern recognition engine, which can be used
+                    with the reader interface to the parser. It allows to select some
+                    nodes in the document based on an XPath (subset) expression. Used
+                    for debugging.
+                </p></dd><dt><span class="term"><code class="option">--pedantic</code></span></dt><dd><p>Enable additional warnings.</p></dd><dt><span class="term"><code class="option">--postvalid</code></span></dt><dd><p>Validate after parsing has completed.</p></dd><dt><span class="term"><code class="option">--push</code></span></dt><dd><p>Use the push mode of the parser.</p></dd><dt><span class="term"><code class="option">--quiet</code></span></dt><dd><p>Don't print informational messages to stderr.</p></dd><dt><span class="term"><code class="option">--recover</code></span></dt><dd><p>Output any parsable portions of an invalid document.</p></dd><dt><span class="term"><code class="option">--relaxng <em class="replaceable"><code>SCHEMA</code></em></code></span></dt><dd><p>
+                    Use RelaxNG file named <em class="replaceable"><code>SCHEMA</code></em>
+                    for validation.
+                </p></dd><dt><span class="term"><code class="option">--repeat</code></span></dt><dd><p>Repeat 100 times, for timing or profiling.</p></dd><dt><span class="term"><code class="option">--schema <em class="replaceable"><code>SCHEMA</code></em></code></span></dt><dd><p>
+                    Use a W3C <acronym class="acronym">XML</acronym> Schema file
+                    named <em class="replaceable"><code>SCHEMA</code></em> for validation.
+                </p></dd><dt><span class="term"><code class="option">--shell</code></span></dt><dd><p>
+                    Run a navigating shell. Details on available commands in shell mode
+                    are below (see <a class="xref" href="#shell" title="SHELL COMMANDS">the section called &#8220;SHELL COMMANDS&#8221;</a>).
+                </p></dd><dt><span class="term"><code class="option">--xpath "<em class="replaceable"><code>XPath_expression</code></em>"</code></span></dt><dd><p>
+                    Run an XPath expression given as argument and print the
+                    result. In case of a nodeset result, each node in the
+                    node set is serialized in full in the output. In case
+                    of an empty node set the "XPath set is empty" result
+                    will be shown and exit code 11 will be returned..
+                    This feature is EXPERIMENTAL. Implementation details can
+                    change without futher notice.
+                </p></dd><dt><span class="term"><code class="option">--stream</code></span></dt><dd><p>
+                    Use streaming <acronym class="acronym">API</acronym> - useful when used in combination
+                    with <code class="option">--relaxng</code> or <code class="option">--valid</code> options
+                    for validation of files that are too large to be held in memory.
+                </p></dd><dt><span class="term"><code class="option">--testIO</code></span></dt><dd><p>Test user input/output support.</p></dd><dt><span class="term"><code class="option">--timing</code></span></dt><dd><p>
+                    Output information about the time it takes <span class="command"><strong>xmllint</strong></span> to perform the
+                    various steps.
+                </p></dd><dt><span class="term"><code class="option">--valid</code></span></dt><dd><p>
+                    Determine if the document is a valid instance of the included
+                    Document Type Definition (<acronym class="acronym">DTD</acronym>).
+                    A <acronym class="acronym">DTD</acronym> to be validated against also can be
+                    specified at the command line using the <code class="option">--dtdvalid</code>
+                    option. By default, <span class="command"><strong>xmllint</strong></span> also checks to determine if the
+                    document is well-formed.
+                </p></dd><dt><span class="term"><code class="option">--version</code></span></dt><dd><p>
+                    Display the version of <span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span> used.
+                </p></dd><dt><span class="term"><code class="option">--walker</code></span></dt><dd><p>
+                    Test the walker module, which is a reader interface but for a
+                    document tree, instead of using the reader <acronym class="acronym">API</acronym> on
+                    an unparsed document it works on an existing in-memory tree. Used for
+                    debugging.
+                </p></dd><dt><span class="term"><code class="option">--xinclude</code></span></dt><dd><p>Do XInclude processing.</p></dd><dt><span class="term"><code class="option">--xmlout</code></span></dt><dd><p>
+                    Used in conjunction with <code class="option">--html</code>. Usually
+                    when <acronym class="acronym">HTML</acronym> is parsed the document is saved with
+                    the <acronym class="acronym">HTML</acronym> serializer. But with this option the
+                    resulting document is saved with the <acronym class="acronym">XML</acronym>
+                    serializer. This is primarily used to
+                    generate <acronym class="acronym">XHTML</acronym> from <acronym class="acronym">HTML</acronym> input.
+                </p></dd></dl></div></div><div class="refsect1"><a name="shell"></a><h2>SHELL COMMANDS</h2><p>
+        <span class="command"><strong>xmllint</strong></span> offers an interactive shell mode invoked with
+        the <code class="option">--shell</code> command. Available commands in shell mode
+        include (in alphabetical order):
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span class="command"><strong>base</strong></span></span></dt><dd><p>Display <acronym class="acronym">XML</acronym> base of the node.</p></dd><dt><span class="term"><span class="command"><strong>bye</strong></span></span></dt><dd><p>Leave the shell.</p></dd><dt><span class="term"><span class="command"><strong>cat <em class="replaceable"><code>NODE</code></em></strong></span></span></dt><dd><p>Display the given node or the current one.</p></dd><dt><span class="term"><span class="command"><strong>cd <em class="replaceable"><code>PATH</code></em></strong></span></span></dt><dd><p>
+                    Change the current node to the given path (if unique) or root if no
+                    argument is given.
+                </p></dd><dt><span class="term"><span class="command"><strong>dir <em class="replaceable"><code>PATH</code></em></strong></span></span></dt><dd><p>
+                    Dumps information about the node (namespace, attributes, content).
+                </p></dd><dt><span class="term"><span class="command"><strong>du <em class="replaceable"><code>PATH</code></em></strong></span></span></dt><dd><p>
+                    Show the structure of the subtree under the given path or the current node.
+                </p></dd><dt><span class="term"><span class="command"><strong>exit</strong></span></span></dt><dd><p>Leave the shell.</p></dd><dt><span class="term"><span class="command"><strong>help</strong></span></span></dt><dd><p>Show this help.</p></dd><dt><span class="term"><span class="command"><strong>load <em class="replaceable"><code>FILENAME</code></em></strong></span></span></dt><dd><p>Load a new document with the given filename.</p></dd><dt><span class="term"><span class="command"><strong>ls <em class="replaceable"><code>PATH</code></em></strong></span></span></dt><dd><p>List contents of the given path or the current directory.</p></dd><dt><span class="term"><span class="command"><strong>pwd</strong></span></span></dt><dd><p>Display the path to the current node.</p></dd><dt><span class="term"><span class="command"><strong>quit</strong></span></span></dt><dd><p>Leave the shell.</p></dd><dt><span class="term"><span class="command"><strong>save <em class="replaceable"><code>FILENAME</code></em></strong></span></span></dt><dd><p>
+                    Save the current document to the given filename or to the original name.
+                </p></dd><dt><span class="term"><code class="option">validate</code></span></dt><dd><p>Check the document for errors.</p></dd><dt><span class="term"><span class="command"><strong>write <em class="replaceable"><code>FILENAME</code></em></strong></span></span></dt><dd><p>Write the current node to the given filename.</p></dd></dl></div></div><div class="refsect1"><a name="environment"></a><h2>ENVIRONMENT</h2><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="envar">SGML_CATALOG_FILES</code></span></dt><dd><p><acronym class="acronym">SGML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <code class="envar">SGML_CATALOG_FILES</code> environment variable to a list
+                    of catalogs. An empty one should deactivate loading the
+                    default catalog.
+                </p></dd><dt><span class="term"><code class="envar">XML_CATALOG_FILES</code></span></dt><dd><p><acronym class="acronym">XML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <code class="envar">XML_CATALOG_FILES</code> environment variable to a space-separated
+                    list of catalogs. Use percent-encoding to escape spaces or other characters.
+                    An empty variable should deactivate loading the default catalog.
+                </p></dd><dt><span class="term"><code class="envar">XML_DEBUG_CATALOG</code></span></dt><dd><p>Setting the environment variable <code class="envar">XML_DEBUG_CATALOG</code>
+                    to <em class="parameter"><code>non-zero</code></em> using the <span class="command"><strong>export</strong></span>
+                    command outputs debugging information related to catalog operations.
+                </p></dd><dt><span class="term"><code class="envar">XMLLINT_INDENT</code></span></dt><dd><p>Setting the environment variable <code class="envar">XMLLINT_INDENT</code>
+                    controls the indentation. The default value is two spaces "  ".
+                </p></dd></dl></div></div><div class="refsect1"><a name="diagnostics"></a><h2>DIAGNOSTICS</h2><p>
+        <span class="command"><strong>xmllint</strong></span> return codes provide information that can be used when
+        calling it from scripts.
+    </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span class="errorcode">0</span></span></dt><dd><p>No error</p></dd><dt><span class="term"><span class="errorcode">1</span></span></dt><dd><p>Unclassified</p></dd><dt><span class="term"><span class="errorcode">2</span></span></dt><dd><p>Error in <acronym class="acronym">DTD</acronym></p></dd><dt><span class="term"><span class="errorcode">3</span></span></dt><dd><p>Validation error</p></dd><dt><span class="term"><span class="errorcode">4</span></span></dt><dd><p>Validation error</p></dd><dt><span class="term"><span class="errorcode">5</span></span></dt><dd><p>Error in schema compilation</p></dd><dt><span class="term"><span class="errorcode">6</span></span></dt><dd><p>Error writing output</p></dd><dt><span class="term"><span class="errorcode">7</span></span></dt><dd><p>
+                    Error in pattern (generated when <code class="option">--pattern</code> option is used)
+                </p></dd><dt><span class="term"><span class="errorcode">9</span></span></dt><dd><p>Out of memory error</p></dd><dt><span class="term"><span class="errorcode">10</span></span></dt><dd><p>XPath evaluation error</p></dd><dt><span class="term"><span class="errorcode">11</span></span></dt><dd><p>XPath result is empty</p></dd></dl></div></div><div class="refsect1"><a name="seealso"></a><h2>SEE ALSO</h2><p><span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span>
+    </p><p>
+        More information can be found at
+        </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="citerefentry"><span class="refentrytitle">libxml</span>(3)</span> web page <a class="ulink" href="https://gitlab.gnome.org/GNOME/libxml2" target="_top">https://gitlab.gnome.org/GNOME/libxml2</a>
+                </p></li></ul></div><p>
+    </p></div></div></body></html>

local-test-libxml2-delta-01/afc-libxml2/doc/xmllint.xml

@@ -0,0 +1,1045 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"
+   href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+
+    <!ENTITY xmllint "<command>xmllint</command>">
+]>
+
+<refentry>
+
+<refentryinfo>
+    <title>xmllint Manual</title>
+    <productname>libxml2</productname>
+    <copyright>
+        <year>2001</year>
+        <year>2004</year>
+    </copyright>
+    <authorgroup>
+        <author>
+            <firstname>John</firstname>
+            <surname>Fleck</surname>
+            <affiliation>
+                <address>
+                    <email>jfleck@inkstain.net</email>
+                </address>
+            </affiliation>
+        </author>
+        <author>
+            <firstname>Ziying</firstname>
+            <surname>Sherwin</surname>
+            <affiliation>
+                <address>
+                    <email>sherwin@nlm.nih.gov</email>
+                </address>
+            </affiliation>
+        </author>
+        <author>
+            <firstname>Heiko</firstname>
+            <surname>Rupp</surname>
+            <affiliation>
+                <address>
+                    <email>hwr@pilhuhn.de</email>
+                </address>
+            </affiliation>
+        </author>
+    </authorgroup>
+    <!-- still a bit buggy output, will talk to docbook-xsl upstream to fix this -->
+    <!-- <releaseinfo>This is release 0.5 of the xmllint Manual.</releaseinfo> -->
+    <!-- <edition>0.5</edition> -->
+</refentryinfo>
+
+<refmeta>
+    <refentrytitle>xmllint</refentrytitle>
+    <manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+    <refname>xmllint</refname>
+    <refpurpose>command line <acronym>XML</acronym> tool</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+    <cmdsynopsis>
+    <command>xmllint</command>
+        <group choice="opt">
+            <arg choice="plain"><option>--version</option></arg>
+            <arg choice="plain"><option>--debug</option></arg>
+            <arg choice="plain"><option>--quiet</option></arg>
+            <arg choice="plain"><option>--shell</option></arg>
+            <arg choice="plain"><option>--xpath "<replaceable class="option">XPath_expression</replaceable>"</option></arg>
+            <arg choice="plain"><option>--debugent</option></arg>
+            <arg choice="plain"><option>--copy</option></arg>
+            <arg choice="plain"><option>--recover</option></arg>
+            <arg choice="plain"><option>--huge</option></arg>
+            <arg choice="plain"><option>--nocompact</option></arg>
+            <arg choice="plain"><option>--nodefdtd</option></arg>
+            <arg choice="plain"><option>--nodict</option></arg>
+            <arg choice="plain"><option>--noenc</option></arg>
+            <arg choice="plain"><option>--noent</option></arg>
+            <arg choice="plain"><option>--nofixup-base-uris</option></arg>
+            <arg choice="plain"><option>--noout</option></arg>
+            <arg choice="plain"><option>--nonet</option></arg>
+            <arg choice="plain"><option>--path "<replaceable class="option">PATH(S)</replaceable>"</option></arg>
+            <arg choice="plain"><option>--load-trace</option></arg>
+            <arg choice="plain"><option>--htmlout</option></arg>
+            <arg choice="plain"><option>--nowrap</option></arg>
+            <arg choice="plain"><option>--valid</option></arg>
+            <arg choice="plain"><option>--postvalid</option></arg>
+            <arg choice="plain"><option>--dtdvalid <replaceable class="option">URL</replaceable></option></arg>
+            <arg choice="plain"><option>--dtdvalidfpi <replaceable class="option">FPI</replaceable></option></arg>
+            <arg choice="plain"><option>--timing</option></arg>
+            <arg choice="plain"><option>--output <replaceable class="option">FILE</replaceable></option></arg>
+            <arg choice="plain"><option>--repeat</option></arg>
+            <arg choice="plain"><option>--insert</option></arg>
+            <arg choice="plain"><option>--compress</option></arg>
+            <arg choice="plain"><option>--html</option></arg>
+            <arg choice="plain"><option>--xmlout</option></arg>
+            <arg choice="plain"><option>--push</option></arg>
+            <arg choice="plain"><option>--memory</option></arg>
+            <arg choice="plain"><option>--max-ampl <replaceable class="option">INTEGER</replaceable></option></arg>
+            <arg choice="plain"><option>--maxmem <replaceable class="option">NBBYTES</replaceable></option></arg>
+            <arg choice="plain"><option>--nowarning</option></arg>
+            <arg choice="plain"><option>--noblanks</option></arg>
+            <arg choice="plain"><option>--nocdata</option></arg>
+            <arg choice="plain"><option>--format</option></arg>
+            <arg choice="plain"><option>--pretty <replaceable class="option">INTEGER</replaceable></option></arg>
+            <arg choice="plain"><option>--encode <replaceable class="option">ENCODING</replaceable></option></arg>
+            <arg choice="plain"><option>--dropdtd</option></arg>
+            <arg choice="plain"><option>--nsclean</option></arg>
+            <arg choice="plain"><option>--testIO</option></arg>
+            <arg choice="plain"><option>--catalogs</option></arg>
+            <arg choice="plain"><option>--nocatalogs</option></arg>
+            <arg choice="plain"><option>--auto</option></arg>
+            <arg choice="plain"><option>--xinclude</option></arg>
+            <arg choice="plain"><option>--noxincludenode</option></arg>
+            <arg choice="plain"><option>--loaddtd</option></arg>
+            <arg choice="plain"><option>--dtdattr</option></arg>
+            <arg choice="plain"><option>--stream</option></arg>
+            <arg choice="plain"><option>--walker</option></arg>
+            <arg choice="plain"><option>--pattern <replaceable class="option">PATTERNVALUE</replaceable></option></arg>
+            <arg choice="plain"><option>--relaxng <replaceable class="option">SCHEMA</replaceable></option></arg>
+            <arg choice="plain"><option>--schema <replaceable class="option">SCHEMA</replaceable></option></arg>
+            <arg choice="plain"><option>--schematron <replaceable class="option">SCHEMA</replaceable></option></arg>
+            <arg choice="plain"><option>--c14n</option></arg>
+            <arg choice="plain"><option>--c14n11</option></arg>
+            <arg choice="plain"><option>--exc-c14n</option></arg>
+            <arg choice="plain"><option>--pedantic</option></arg>
+            <arg choice="plain"><option>--sax</option></arg>
+            <arg choice="plain"><option>--sax1</option></arg>
+            <arg choice="plain"><option>--oldxml10</option></arg>
+        </group>
+        <group choice="req">
+            <arg choice="plain" rep="repeat"><replaceable>XML-FILE(S)</replaceable></arg>
+            <arg choice="plain" rep="norepeat">-</arg>
+        </group>
+    </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>
+        The &xmllint; program parses one or more <acronym>XML</acronym> files,
+        specified on the command line as <replaceable>XML-FILE</replaceable>
+        (or the standard input if the filename provided
+        is <emphasis role="bold">-</emphasis> ). It prints various types of
+        output, depending upon the options selected. It is useful for detecting
+        errors both in <acronym>XML</acronym> code and in
+        the <acronym>XML</acronym> parser itself.
+    </para>
+    <para>&xmllint; is included in <citerefentry>
+        <refentrytitle>libxml</refentrytitle>
+        <manvolnum>3</manvolnum>
+    </citerefentry>.</para>
+</refsect1>
+
+<refsect1 id="options">
+    <title>OPTIONS</title>
+    <para>
+        &xmllint; accepts the following options (in alphabetical order):
+    </para>
+
+    <variablelist>
+
+        <varlistentry>
+            <term><option>--auto</option></term>
+            <listitem>
+                <para>Generate a small document for testing purposes.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--catalogs</option></term>
+            <listitem>
+                <para>
+                    Use the <acronym>SGML</acronym> catalog(s) from <envar>SGML_CATALOG_FILES</envar>.
+                    Otherwise <acronym>XML</acronym> catalogs starting
+                    from <filename>/etc/xml/catalog</filename> or, more specifically,
+                    <filename>${sysconfdir}/xml/catalog</filename> are used by default.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--compress</option></term>
+            <listitem>
+                <para>
+                    Turn on <citerefentry>
+                <refentrytitle>gzip</refentrytitle>
+                <manvolnum>1</manvolnum>
+            </citerefentry> compression of output.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--copy</option></term>
+            <listitem>
+                <para>Test the internal copy implementation.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--c14n</option></term>
+            <term><option>--c14n11</option></term>
+            <term><option>--exc-c14n</option></term>
+            <listitem>
+                <para>
+                    Use the W3C <acronym>XML</acronym> Canonicalisation (<acronym>C14N</acronym>) to
+                    serialize the result of parsing to <filename class="devicefile">stdout</filename>.
+                    It keeps comments in the result.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--dtdvalid <replaceable class="option">URL</replaceable></option></term>
+            <listitem>
+                <para>
+                    Use the <acronym>DTD</acronym> specified by
+                    an <replaceable>URL</replaceable> for validation.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--dtdvalidfpi <replaceable class="option">FPI</replaceable></option></term>
+            <listitem>
+                <para>
+                    Use the <acronym>DTD</acronym> specified by a Formal Public
+                    Identifier <replaceable>FPI</replaceable> for validation, note that this
+                    will require a catalog exporting that Formal Public Identifier to work.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--debug</option></term>
+            <listitem>
+                <para>
+                    Parse a file and output an annotated tree of the
+                    in-memory version of the document.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--debugent</option></term>
+            <listitem>
+                <para>Debug the entities defined in the document.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--dropdtd</option></term>
+            <listitem>
+                <para>Remove <acronym>DTD</acronym> from output.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--dtdattr</option></term>
+            <listitem>
+                <para>
+                    Fetch external <acronym>DTD</acronym> and populate the tree with
+                    inherited attributes.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--encode <replaceable class="option">ENCODING</replaceable></option></term>
+            <listitem>
+                <para>Output in the given encoding. Note that this works for full document not fragments or result from XPath queries.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--format</option></term>
+            <listitem>
+                <para>
+                    Reformat and reindent the output. The <envar>XMLLINT_INDENT</envar>
+                    environment variable controls the indentation. The default value is two
+                    spaces &quot;  &quot;).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--html</option></term>
+            <listitem>
+                <para>Use the <acronym>HTML</acronym> parser.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--htmlout</option></term>
+            <listitem>
+                <para>
+                    Output results as an <acronym>HTML</acronym> file. This
+                    causes &xmllint; to output the necessary <acronym>HTML</acronym>
+                    tags surrounding the result tree output so the results can be
+                    displayed/viewed in a browser.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--huge</option></term>
+            <listitem>
+                <para>Ignore some hardcoded parser limits.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--insert</option></term>
+            <listitem>
+                <para>Test for valid insertions.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--loaddtd</option></term>
+            <listitem>
+                <para>Fetch an external <acronym>DTD</acronym>.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--load-trace</option></term>
+            <listitem>
+                <para>
+                    Display all the documents loaded during the processing
+                    to <filename class="devicefile">stderr</filename>.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--max-ampl <replaceable class="option">INTEGER</replaceable></option></term>
+            <listitem>
+                <para>
+                    Set the maximum amplification factor which protects against
+                    exponential entity expansion ("billion laughs"). The default value
+                    is 5. Documents making heavy use of entity expansion may require a
+                    higher value.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--maxmem <replaceable class="option">NNBYTES</replaceable></option></term>
+            <listitem>
+                <para>
+                    Test the parser memory support. <replaceable>NNBYTES</replaceable>
+                    is the maximum number of bytes the library is allowed to allocate.
+                    This can also be used to make sure batch processing
+                    of <acronym>XML</acronym> files will not exhaust the virtual memory
+                    of the server running them.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--memory</option></term>
+            <listitem>
+                <para>Parse from memory.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noblanks</option></term>
+            <listitem>
+                <para>Drop ignorable blank spaces.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nocatalogs</option></term>
+            <listitem>
+                <para>Do not use any catalogs.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nocdata</option></term>
+            <listitem>
+                <para>Substitute CDATA section by equivalent text nodes.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nocompact</option></term>
+            <listitem>
+                <para>
+                    Do not generate compact text nodes (parser option
+                    XML_PARSE_COMPACT). Only for debugging.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nodefdtd</option></term>
+            <listitem>
+                <para>
+                    Do not set default HTML doctype (parser option
+                    HTML_PARSE_NODEFDTD).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nodict</option></term>
+            <listitem>
+                <para>
+                    Don't use dictionaries (parser option XML_PARSE_NODICT).
+                    Only for debugging.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noenc</option></term>
+            <listitem>
+                <para>
+                    Ignore encoding declaration (parser option
+                    XML_PARSE_IGNORE_ENC).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noent</option></term>
+            <listitem>
+                <para>
+                    Substitute entity values for entity references. By default, &xmllint;
+                    leaves entity references in place.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nofixup-base-uris</option></term>
+            <listitem>
+                <para>
+                    Don't fix xml:base URIs when processing XIncludes
+                    (parser option XML_PARSE_NOBASEFIX).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nonet</option></term>
+            <listitem>
+                <para>
+                    Do not use the Internet to fetch <acronym>DTD</acronym>s or entities.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noout</option></term>
+            <listitem>
+                <para>
+                    Suppress output. By default, &xmllint; outputs the result tree.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nowarning</option></term>
+            <listitem>
+                <para>Do not emit warnings from the parser and/or validator.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nowrap</option></term>
+            <listitem>
+                <para>Do not output <acronym>HTML</acronym> doc wrapper.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--noxincludenode</option></term>
+            <listitem>
+                <para>
+                    Do XInclude processing but do not generate XInclude start and end nodes.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--nsclean</option></term>
+            <listitem>
+                <para>Remove redundant namespace declarations.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--oldxml10</option></term>
+            <listitem>
+                <para>
+                    Use deprecated parsing rules before XML 1.0,
+                    5th edition.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--output <replaceable class="option">FILE</replaceable></option></term>
+            <listitem>
+                <para>
+                    Define a file path where &xmllint; will save the result of parsing.
+                    Usually the programs build a tree and save it
+                    on <filename class="devicefile">stdout</filename>, with this option
+                    the result <acronym>XML</acronym> instance will be saved onto a file.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--path "<replaceable class="option">PATH(S)</replaceable>"</option></term>
+            <listitem>
+                <para>
+                    Use the (space- or colon-separated) list of filesystem paths specified
+                    by <replaceable>PATHS</replaceable> to load <acronym>DTD</acronym>s or
+                    entities. Enclose space-separated lists by quotation marks.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--pattern <replaceable class="option">PATTERNVALUE</replaceable></option></term>
+            <listitem>
+                <para>
+                    Used to exercise the pattern recognition engine, which can be used
+                    with the reader interface to the parser. It allows to select some
+                    nodes in the document based on an XPath (subset) expression. Used
+                    for debugging.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--pedantic</option></term>
+            <listitem>
+                <para>Enable additional warnings.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--postvalid</option></term>
+            <listitem>
+                <para>Validate after parsing has completed.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--pretty <replaceable class="option">INTEGER</replaceable></option></term>
+            <listitem>
+                <para>
+                    Value 0 means no formatting, 1 means XML_SAVE_FORMAT
+                    (same as --format), 2 means XML_SAVE_WSNONSIG.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--push</option></term>
+            <listitem>
+                <para>Use the push mode of the parser.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--quiet</option></term>
+            <listitem>
+                <para>Don't print informational messages to stderr.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--recover</option></term>
+            <listitem>
+                <para>Output any parsable portions of an invalid document.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--relaxng <replaceable class="option">SCHEMA</replaceable></option></term>
+            <listitem>
+                <para>
+                    Use RelaxNG file named <replaceable class="option">SCHEMA</replaceable>
+                    for validation.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--repeat</option></term>
+            <listitem>
+                <para>Repeat 100 times, for timing or profiling.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--sax</option></term>
+            <listitem>
+                <para>Print SAX callbacks (only for debugging).</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--sax1</option></term>
+            <listitem>
+                <para>Use deprecated SAX1 interface (only for debugging).</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--schema <replaceable>SCHEMA</replaceable></option></term>
+            <listitem>
+                <para>
+                    Use a W3C <acronym>XML</acronym> Schema file
+                    named <replaceable>SCHEMA</replaceable> for validation.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--schematron <replaceable>SCHEMA</replaceable></option></term>
+            <listitem>
+                <para>
+                    Use a Schematron file
+                    named <replaceable>SCHEMA</replaceable> for validation.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--shell</option></term>
+            <listitem>
+                <para>
+                    Run a navigating shell. Details on available commands in shell mode
+                    are below (see <xref linkend="shell"/>).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--xpath "<replaceable class="option">XPath_expression</replaceable>"</option></term>
+            <listitem>
+                <para>
+                    Run an XPath expression given as argument and print the
+                    result. In case of a nodeset result, each node in the
+                    node set is serialized in full in the output. In case
+                    of an empty node set the "XPath set is empty" result
+                    will be shown and exit code 11 will be returned..
+                    This feature is EXPERIMENTAL. Implementation details can
+                    change without futher notice.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--stream</option></term>
+            <listitem>
+                <para>
+                    Use streaming <acronym>API</acronym> - useful when used in combination
+                    with <option>--relaxng</option> or <option>--valid</option> options
+                    for validation of files that are too large to be held in memory.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--testIO</option></term>
+            <listitem>
+                <para>Test user input/output support.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--timing</option></term>
+            <listitem>
+                <para>
+                    Output information about the time it takes &xmllint; to perform the
+                    various steps.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--valid</option></term>
+            <listitem>
+                <para>
+                    Determine if the document is a valid instance of the included
+                    Document Type Definition (<acronym>DTD</acronym>).
+                    A <acronym>DTD</acronym> to be validated against also can be
+                    specified at the command line using the <option>--dtdvalid</option>
+                    option. By default, &xmllint; also checks to determine if the
+                    document is well-formed.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--version</option></term>
+            <listitem>
+                <para>
+                    Display the version of <citerefentry>
+                <refentrytitle>libxml</refentrytitle>
+                <manvolnum>3</manvolnum>
+            </citerefentry> used.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--walker</option></term>
+            <listitem>
+                <para>
+                    Test the walker module, which is a reader interface but for a
+                    document tree, instead of using the reader <acronym>API</acronym> on
+                    an unparsed document it works on an existing in-memory tree. Used for
+                    debugging.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--xinclude</option></term>
+            <listitem>
+                <para>Do XInclude processing.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>--xmlout</option></term>
+            <listitem>
+                <para>
+                    Used in conjunction with <option>--html</option>. Usually
+                    when <acronym>HTML</acronym> is parsed the document is saved with
+                    the <acronym>HTML</acronym> serializer. But with this option the
+                    resulting document is saved with the <acronym>XML</acronym>
+                    serializer. This is primarily used to
+                    generate <acronym>XHTML</acronym> from <acronym>HTML</acronym> input.
+                </para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="shell">
+    <title>SHELL COMMANDS</title>
+    <para>
+        &xmllint; offers an interactive shell mode invoked with
+        the <option>--shell</option> command. Available commands in shell mode
+        include (in alphabetical order):
+    </para>
+    <variablelist>
+
+        <varlistentry>
+            <term><command>base</command></term>
+            <listitem>
+                <para>Display <acronym>XML</acronym> base of the node.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>bye</command></term>
+            <listitem>
+                <para>Leave the shell.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>cat <replaceable>NODE</replaceable></command></term>
+            <listitem>
+                <para>Display the given node or the current one.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>cd <replaceable>PATH</replaceable></command></term>
+            <listitem>
+                <para>
+                    Change the current node to the given path (if unique) or root if no
+                    argument is given.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>dir <replaceable>PATH</replaceable></command></term>
+            <listitem>
+                <para>
+                    Dumps information about the node (namespace, attributes, content).
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>du <replaceable>PATH</replaceable></command></term>
+            <listitem>
+                <para>
+                    Show the structure of the subtree under the given path or the current node.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>exit</command></term>
+            <listitem>
+                <para>Leave the shell.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>help</command></term>
+            <listitem>
+                <para>Show this help.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>load <replaceable>FILENAME</replaceable></command></term>
+            <listitem>
+                <para>Load a new document with the given filename.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>ls <replaceable>PATH</replaceable></command></term>
+            <listitem>
+                <para>List contents of the given path or the current directory.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>pwd</command></term>
+            <listitem>
+                <para>Display the path to the current node.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>quit</command></term>
+            <listitem>
+                <para>Leave the shell.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>save <replaceable>FILENAME</replaceable></command></term>
+            <listitem>
+                <para>
+                    Save the current document to the given filename or to the original name.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><option>validate</option></term>
+            <listitem>
+                <para>Check the document for errors.</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><command>write <replaceable>FILENAME</replaceable></command></term>
+            <listitem>
+                <para>Write the current node to the given filename.</para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="environment">
+    <title>ENVIRONMENT</title>
+    <variablelist>
+
+        <varlistentry>
+            <term><envar>SGML_CATALOG_FILES</envar></term>
+            <listitem>
+                <para><acronym>SGML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <envar>SGML_CATALOG_FILES</envar> environment variable to a list
+                    of catalogs. An empty one should deactivate loading the
+                    default catalog.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><envar>XML_CATALOG_FILES</envar></term>
+            <listitem>
+                <para><acronym>XML</acronym> catalog behavior can be changed by redirecting
+                    queries to the user's own set of catalogs. This can be done by setting
+                    the <envar>XML_CATALOG_FILES</envar> environment variable to a space-separated
+                    list of catalogs. Use percent-encoding to escape spaces or other characters.
+                    An empty variable should deactivate loading the default catalog.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><envar>XML_DEBUG_CATALOG</envar></term>
+            <listitem>
+                <para>Setting the environment variable <envar>XML_DEBUG_CATALOG</envar>
+                    to <parameter>non-zero</parameter> using the <command>export</command>
+                    command outputs debugging information related to catalog operations.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><envar>XMLLINT_INDENT</envar></term>
+            <listitem>
+                <para>Setting the environment variable <envar>XMLLINT_INDENT</envar>
+                    controls the indentation. The default value is two spaces &quot;  &quot;.
+                </para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="diagnostics">
+    <title>DIAGNOSTICS</title>
+    <para>
+        &xmllint; return codes provide information that can be used when
+        calling it from scripts.
+    </para>
+    <!-- better use segmentedlist element later,
+         which is currently only supported in snapshots -->
+    <variablelist>
+
+        <varlistentry>
+            <term><errorcode>0</errorcode></term>
+            <listitem>
+                <para>No error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>1</errorcode></term>
+            <listitem>
+                <para>Unclassified</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>2</errorcode></term>
+            <listitem>
+                <para>Error in <acronym>DTD</acronym></para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>3</errorcode></term>
+            <listitem>
+                <para>Validation error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>4</errorcode></term>
+            <listitem>
+                <para>Validation error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>5</errorcode></term>
+            <listitem>
+                <para>Error in schema compilation</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>6</errorcode></term>
+            <listitem>
+                <para>Error writing output</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>7</errorcode></term>
+            <listitem>
+                <para>
+                    Error in pattern (generated when <option>--pattern</option> option is used)
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>9</errorcode></term>
+            <listitem>
+                <para>Out of memory error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>10</errorcode></term>
+            <listitem>
+                <para>XPath evaluation error</para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><errorcode>11</errorcode></term>
+            <listitem>
+                <para>XPath result is empty</para>
+            </listitem>
+        </varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<refsect1 id="seealso">
+    <title>SEE ALSO</title>
+    <para><citerefentry>
+            <refentrytitle>libxml</refentrytitle>
+            <manvolnum>3</manvolnum>
+        </citerefentry>
+    </para>
+    <para>
+        More information can be found at
+        <itemizedlist>
+            <listitem>
+                <para><citerefentry>
+                        <refentrytitle>libxml</refentrytitle>
+                        <manvolnum>3</manvolnum>
+                    </citerefentry> web page <ulink url="https://gitlab.gnome.org/GNOME/libxml2"/>
+                </para>
+            </listitem>
+        </itemizedlist>
+    </para>
+</refsect1>
+
+</refentry>

local-test-libxml2-delta-01/afc-libxml2/example/.gitignore

@@ -0,0 +1,16 @@
+/gjobread
+/io1
+/io2
+/parse1
+/parse2
+/parse3
+/parse4
+/reader1
+/reader2
+/reader3
+/reader4
+/testWriter
+/tree1
+/tree2
+/xpath1
+/xpath2

local-test-libxml2-delta-01/afc-libxml2/example/Makefile.am

@@ -0,0 +1,44 @@
+EXTRA_DIST = \
+    gjobs.xml \
+    meson.build \
+    test1.xml \
+    test2.xml \
+    test3.xml
+
+check_PROGRAMS = \
+    gjobread \
+    io1 \
+    io2 \
+    parse1 \
+    parse2 \
+    parse3 \
+    parse4 \
+    reader1 \
+    reader2 \
+    reader3 \
+    reader4 \
+    testWriter \
+    tree1 \
+    tree2 \
+    xpath1 \
+    xpath2
+
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+LDADD = $(top_builddir)/libxml2.la
+
+gjobread_SOURCES=gjobread.c
+io1_SOURCES = io1.c
+io2_SOURCES = io2.c
+parse1_SOURCES = parse1.c
+parse2_SOURCES = parse2.c
+parse3_SOURCES = parse3.c
+parse4_SOURCES = parse4.c
+reader1_SOURCES = reader1.c
+reader2_SOURCES = reader2.c
+reader3_SOURCES = reader3.c
+reader4_SOURCES = reader4.c
+testWriter_SOURCES = testWriter.c
+tree1_SOURCES = tree1.c
+tree2_SOURCES = tree2.c
+xpath1_SOURCES = xpath1.c
+xpath2_SOURCES = xpath2.c

local-test-libxml2-delta-01/afc-libxml2/example/gjobread.c

@@ -0,0 +1,301 @@
+/*
+ * gjobread.c : a small test program for gnome jobs XML format
+ *
+ * See Copyright for the status of this software.
+ *
+ * Daniel.Veillard@w3.org
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ * This example should compile and run indifferently with libxml-1.8.8 +
+ * and libxml2-2.1.0 +
+ * Check the COMPAT comments below
+ */
+
+/*
+ * COMPAT using xml-config --cflags to get the include path this will
+ * work with both 
+ */
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
+#define DEBUG(x) printf(x)
+
+/*
+ * A person record
+ * an xmlChar * is really an UTF8 encoded char string (0 terminated)
+ */
+typedef struct person {
+    xmlChar *name;
+    xmlChar *email;
+    xmlChar *company;
+    xmlChar *organisation;
+    xmlChar *smail;
+    xmlChar *webPage;
+    xmlChar *phone;
+} person, *personPtr;
+
+/*
+ * And the code needed to parse it
+ */
+static personPtr
+parsePerson(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) {
+    personPtr ret = NULL;
+
+DEBUG("parsePerson\n");
+    /*
+     * allocate the struct
+     */
+    ret = (personPtr) malloc(sizeof(person));
+    if (ret == NULL) {
+        fprintf(stderr,"out of memory\n");
+	return(NULL);
+    }
+    memset(ret, 0, sizeof(person));
+
+    /* We don't care what the top level element name is */
+    /* COMPAT xmlChildrenNode is a macro unifying libxml1 and libxml2 names */
+    cur = cur->xmlChildrenNode;
+    while (cur != NULL) {
+        if ((!xmlStrcmp(cur->name, (const xmlChar *)"Person")) &&
+	    (cur->ns == ns))
+	    ret->name = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+        if ((!xmlStrcmp(cur->name, (const xmlChar *)"Email")) &&
+	    (cur->ns == ns))
+	    ret->email = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+	cur = cur->next;
+    }
+
+    return(ret);
+}
+
+/*
+ * and to print it
+ */
+static void
+printPerson(personPtr cur) {
+    if (cur == NULL) return;
+    printf("------ Person\n");
+    if (cur->name) printf("	name: %s\n", cur->name);
+    if (cur->email) printf("	email: %s\n", cur->email);
+    if (cur->company) printf("	company: %s\n", cur->company);
+    if (cur->organisation) printf("	organisation: %s\n", cur->organisation);
+    if (cur->smail) printf("	smail: %s\n", cur->smail);
+    if (cur->webPage) printf("	Web: %s\n", cur->webPage);
+    if (cur->phone) printf("	phone: %s\n", cur->phone);
+    printf("------\n");
+}
+
+/*
+ * a Description for a Job
+ */
+typedef struct job {
+    xmlChar *projectID;
+    xmlChar *application;
+    xmlChar *category;
+    personPtr contact;
+    int nbDevelopers;
+    personPtr developers[100]; /* using dynamic alloc is left as an exercise */
+} job, *jobPtr;
+
+/*
+ * And the code needed to parse it
+ */
+static jobPtr
+parseJob(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) {
+    jobPtr ret = NULL;
+
+DEBUG("parseJob\n");
+    /*
+     * allocate the struct
+     */
+    ret = (jobPtr) malloc(sizeof(job));
+    if (ret == NULL) {
+        fprintf(stderr,"out of memory\n");
+	return(NULL);
+    }
+    memset(ret, 0, sizeof(job));
+
+    /* We don't care what the top level element name is */
+    cur = cur->xmlChildrenNode;
+    while (cur != NULL) {
+        
+        if ((!xmlStrcmp(cur->name, (const xmlChar *) "Project")) &&
+	    (cur->ns == ns)) {
+	    ret->projectID = xmlGetProp(cur, (const xmlChar *) "ID");
+	    if (ret->projectID == NULL) {
+		fprintf(stderr, "Project has no ID\n");
+	    }
+	}
+        if ((!xmlStrcmp(cur->name, (const xmlChar *) "Application")) &&
+            (cur->ns == ns))
+	    ret->application = 
+		xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+        if ((!xmlStrcmp(cur->name, (const xmlChar *) "Category")) &&
+	    (cur->ns == ns))
+	    ret->category =
+		xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+        if ((!xmlStrcmp(cur->name, (const xmlChar *) "Contact")) &&
+	    (cur->ns == ns))
+	    ret->contact = parsePerson(doc, ns, cur);
+	cur = cur->next;
+    }
+
+    return(ret);
+}
+
+/*
+ * and to print it
+ */
+static void
+printJob(jobPtr cur) {
+    int i;
+
+    if (cur == NULL) return;
+    printf("=======  Job\n");
+    if (cur->projectID != NULL) printf("projectID: %s\n", cur->projectID);
+    if (cur->application != NULL) printf("application: %s\n", cur->application);
+    if (cur->category != NULL) printf("category: %s\n", cur->category);
+    if (cur->contact != NULL) printPerson(cur->contact);
+    printf("%d developers\n", cur->nbDevelopers);
+
+    for (i = 0;i < cur->nbDevelopers;i++) printPerson(cur->developers[i]);
+    printf("======= \n");
+}
+
+/*
+ * A pool of Gnome Jobs
+ */
+typedef struct gjob {
+    int nbJobs;
+    jobPtr jobs[500]; /* using dynamic alloc is left as an exercise */
+} gJob, *gJobPtr;
+
+
+static gJobPtr
+parseGjobFile(char *filename) {
+    xmlDocPtr doc;
+    gJobPtr ret;
+    jobPtr curjob;
+    xmlNsPtr ns;
+    xmlNodePtr cur;
+
+    /*
+     * build an XML tree from a the file;
+     */
+    doc = xmlReadFile(filename, NULL, XML_PARSE_NOBLANKS);
+    if (doc == NULL) return(NULL);
+
+    /*
+     * Check the document is of the right kind
+     */
+    
+    cur = xmlDocGetRootElement(doc);
+    if (cur == NULL) {
+        fprintf(stderr,"empty document\n");
+	xmlFreeDoc(doc);
+	return(NULL);
+    }
+    ns = xmlSearchNsByHref(doc, cur,
+	    (const xmlChar *) "http://www.gnome.org/some-location");
+    if (ns == NULL) {
+        fprintf(stderr,
+	        "document of the wrong type, GJob Namespace not found\n");
+	xmlFreeDoc(doc);
+	return(NULL);
+    }
+    if (xmlStrcmp(cur->name, (const xmlChar *) "Helping")) {
+        fprintf(stderr,"document of the wrong type, root node != Helping");
+	xmlFreeDoc(doc);
+	return(NULL);
+    }
+
+    /*
+     * Allocate the structure to be returned.
+     */
+    ret = (gJobPtr) malloc(sizeof(gJob));
+    if (ret == NULL) {
+        fprintf(stderr,"out of memory\n");
+	xmlFreeDoc(doc);
+	return(NULL);
+    }
+    memset(ret, 0, sizeof(gJob));
+
+    /*
+     * Now, walk the tree.
+     */
+    /* First level we expect just Jobs */
+    cur = cur->xmlChildrenNode;
+    while ( cur && xmlIsBlankNode ( cur ) ) {
+	cur = cur -> next;
+    }
+    if ( cur == 0 ) {
+	xmlFreeDoc(doc);
+	free(ret);
+	return ( NULL );
+    }
+    if ((xmlStrcmp(cur->name, (const xmlChar *) "Jobs")) || (cur->ns != ns)) {
+        fprintf(stderr,"document of the wrong type, was '%s', Jobs expected",
+		cur->name);
+	fprintf(stderr,"xmlDocDump follows\n");
+#ifdef LIBXML_OUTPUT_ENABLED
+	xmlDocDump ( stderr, doc );
+	fprintf(stderr,"xmlDocDump finished\n");
+#endif /* LIBXML_OUTPUT_ENABLED */
+	xmlFreeDoc(doc);
+	free(ret);
+	return(NULL);
+    }
+
+    /* Second level is a list of Job, but be laxist */
+    cur = cur->xmlChildrenNode;
+    while (cur != NULL) {
+        if ((!xmlStrcmp(cur->name, (const xmlChar *) "Job")) &&
+	    (cur->ns == ns)) {
+	    curjob = parseJob(doc, ns, cur);
+	    if (curjob != NULL)
+	        ret->jobs[ret->nbJobs++] = curjob;
+            if (ret->nbJobs >= 500) break;
+	}
+	cur = cur->next;
+    }
+
+    return(ret);
+}
+
+static void
+handleGjob(gJobPtr cur) {
+    int i;
+
+    /*
+     * Do whatever you want and free the structure.
+     */
+    printf("%d Jobs registered\n", cur->nbJobs);
+    for (i = 0; i < cur->nbJobs; i++) printJob(cur->jobs[i]);
+}
+
+int main(int argc, char **argv) {
+    int i;
+    gJobPtr cur;
+
+    /* COMPAT: Do not generate nodes for formatting spaces */
+    LIBXML_TEST_VERSION
+
+    for (i = 1; i < argc ; i++) {
+	cur = parseGjobFile(argv[i]);
+	if ( cur )
+	  handleGjob(cur);
+	else
+	  fprintf( stderr, "Error parsing file '%s'\n", argv[i]);
+
+    }
+
+    /* Clean up everything else before quitting. */
+    xmlCleanupParser();
+
+    return(0);
+}

local-test-libxml2-delta-01/afc-libxml2/example/gjobs.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<gjob:Helping xmlns:gjob="http://www.gnome.org/some-location">
+  <gjob:Jobs>
+
+    <gjob:Job>
+      <gjob:Project ID="3"/>
+      <gjob:Application>GBackup</gjob:Application>
+      <gjob:Category>Development</gjob:Category>
+
+      <gjob:Update>
+	<gjob:Status>Open</gjob:Status>
+	<gjob:Modified>Mon, 07 Jun 1999 20:27:45 -0400 MET DST</gjob:Modified>
+        <gjob:Salary>USD 0.00</gjob:Salary>
+      </gjob:Update>
+
+      <gjob:Developers>
+        <gjob:Developer>
+        </gjob:Developer>
+      </gjob:Developers>
+
+      <gjob:Contact>
+        <gjob:Person>Nathan Clemons</gjob:Person>
+	<gjob:Email>nathan@windsofstorm.net</gjob:Email>
+        <gjob:Company>
+	</gjob:Company>
+        <gjob:Organisation>
+	</gjob:Organisation>
+        <gjob:Webpage>
+	</gjob:Webpage>
+	<gjob:Snailmail>
+	</gjob:Snailmail>
+	<gjob:Phone>
+	</gjob:Phone>
+      </gjob:Contact>
+
+      <gjob:Requirements>
+      The program should be released as free software, under the GPL.
+      </gjob:Requirements>
+
+      <gjob:Skills>
+      </gjob:Skills>
+
+      <gjob:Details>
+      A GNOME based system that will allow a superuser to configure 
+      compressed and uncompressed files and/or file systems to be backed 
+      up with a supported media in the system.  This should be able to 
+      perform via find commands generating a list of files that are passed 
+      to tar, dd, cpio, cp, gzip, etc., to be directed to the tape machine 
+      or via operations performed on the filesystem itself. Email 
+      notification and GUI status display very important.
+      </gjob:Details>
+
+    </gjob:Job>
+
+  </gjob:Jobs>
+</gjob:Helping>
+

local-test-libxml2-delta-01/afc-libxml2/example/icu.c

@@ -0,0 +1,241 @@
+/*
+ * icu.c: Example how to use ICU for character encoding conversion
+ *
+ * This example shows how to use ICU by installing a custom character
+ * encoding converter with xmlCtxtSetCharEncConvImpl, available
+ * since libxml2 2.14.
+ *
+ * This approach makes it possible to use ICU even if libxml2 is
+ * compiled without ICU support. It also makes sure that *only* ICU
+ * is used. Many Linux distros currently ship libxml2 with support
+ * for both ICU and iconv which makes the library's behavior hard to
+ * predict.
+ *
+ * The long-term plan is to make libxml2 only support a single
+ * conversion library internally (iconv on POSIX).
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <unicode/ucnv.h>
+
+#define ICU_PIVOT_BUF_SIZE 1024
+
+typedef struct {
+    UConverter *uconv; /* for conversion between an encoding and UTF-16 */
+    UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
+    UChar      *pivot_source;
+    UChar      *pivot_target;
+    int        isInput;
+    UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
+} myConvCtxt;
+
+static int
+icuConvert(unsigned char *out, int *outlen,
+           const unsigned char *in, int *inlen, void *vctxt) {
+    myConvCtxt *cd = vctxt;
+    const char *ucv_in = (const char *) in;
+    char *ucv_out = (char *) out;
+    UConverter *target, *source;
+    UErrorCode err = U_ZERO_ERROR;
+    int ret;
+
+    if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || (in == NULL)) {
+        if (outlen != NULL)
+            *outlen = 0;
+        return XML_ENC_ERR_INTERNAL;
+    }
+
+    /*
+     * Note that the ICU API is stateful. It can always consume a certain
+     * amount of input even if the output buffer would overflow. The
+     * remaining input must be processed by calling ucnv_convertEx with a
+     * possibly empty input buffer.
+     *
+     * ucnv_convertEx is always called with reset and flush set to 0,
+     * so we don't mess up the state. This should never generate
+     * U_TRUNCATED_CHAR_FOUND errors.
+     */
+    if (cd->isInput) {
+        source = cd->uconv;
+        target = cd->utf8;
+    } else {
+        source = cd->utf8;
+        target = cd->uconv;
+    }
+
+    ucnv_convertEx(target, source, &ucv_out, ucv_out + *outlen,
+                   &ucv_in, ucv_in + *inlen, cd->pivot_buf,
+                   &cd->pivot_source, &cd->pivot_target,
+                   cd->pivot_buf + ICU_PIVOT_BUF_SIZE, 0, 0, &err);
+
+    *inlen = ucv_in - (const char*) in;
+    *outlen = ucv_out - (char *) out;
+
+    if (U_SUCCESS(err)) {
+        ret = XML_ENC_ERR_SUCCESS;
+    } else {
+        switch (err) {
+            case U_TRUNCATED_CHAR_FOUND:
+                /* Shouldn't happen without flush */
+                ret = XML_ENC_ERR_SUCCESS;
+                break;
+
+            case U_BUFFER_OVERFLOW_ERROR:
+                ret = XML_ENC_ERR_SPACE;
+                break;
+
+            case U_INVALID_CHAR_FOUND:
+            case U_ILLEGAL_CHAR_FOUND:
+            case U_ILLEGAL_ESCAPE_SEQUENCE:
+            case U_UNSUPPORTED_ESCAPE_SEQUENCE:
+                ret = XML_ENC_ERR_INPUT;
+                break;
+
+            case U_MEMORY_ALLOCATION_ERROR:
+                ret = XML_ENC_ERR_MEMORY;
+                break;
+
+            default:
+                ret = XML_ENC_ERR_INTERNAL;
+                break;
+        }
+    }
+
+    return ret;
+}
+
+static int
+icuOpen(const char* name, int isInput, myConvCtxt **out)
+{
+    UErrorCode status;
+    myConvCtxt *cd;
+
+    *out = NULL;
+
+    cd = xmlMalloc(sizeof(myConvCtxt));
+    if (cd == NULL)
+        return XML_ERR_NO_MEMORY;
+
+    cd->isInput = isInput;
+    cd->pivot_source = cd->pivot_buf;
+    cd->pivot_target = cd->pivot_buf;
+
+    status = U_ZERO_ERROR;
+    cd->uconv = ucnv_open(name, &status);
+    if (U_FAILURE(status))
+        goto error;
+
+    status = U_ZERO_ERROR;
+    if (isInput) {
+        ucnv_setToUCallBack(cd->uconv, UCNV_TO_U_CALLBACK_STOP,
+                            NULL, NULL, NULL, &status);
+    }
+    else {
+        ucnv_setFromUCallBack(cd->uconv, UCNV_FROM_U_CALLBACK_STOP,
+                              NULL, NULL, NULL, &status);
+    }
+    if (U_FAILURE(status))
+        goto error;
+
+    status = U_ZERO_ERROR;
+    cd->utf8 = ucnv_open("UTF-8", &status);
+    if (U_FAILURE(status))
+        goto error;
+
+    *out = cd;
+    return 0;
+
+error:
+    if (cd->uconv)
+        ucnv_close(cd->uconv);
+    xmlFree(cd);
+
+    if (status == U_FILE_ACCESS_ERROR)
+        return XML_ERR_UNSUPPORTED_ENCODING;
+    if (status == U_MEMORY_ALLOCATION_ERROR)
+        return XML_ERR_NO_MEMORY;
+    return XML_ERR_SYSTEM;
+}
+
+static void
+icuClose(myConvCtxt *cd)
+{
+    if (cd == NULL)
+        return;
+    ucnv_close(cd->uconv);
+    ucnv_close(cd->utf8);
+    xmlFree(cd);
+}
+
+static void
+icuConvCtxtDtor(void *vctxt) {
+    icuClose(vctxt);
+}
+
+static int
+icuConvImpl(void *vctxt, const char *name,
+            xmlCharEncConverter *conv) {
+    myConvCtxt *inputCtxt = NULL;
+    myConvCtxt *outputCtxt = NULL;
+    int ret;
+
+    ret = icuOpen(name, 1, &inputCtxt);
+    if (ret != 0)
+        goto error;
+    ret = icuOpen(name, 0, &outputCtxt);
+    if (ret != 0)
+        goto error;
+
+    conv->input = icuConvert;
+    conv->output = icuConvert;
+    conv->ctxtDtor = icuConvCtxtDtor;
+    conv->inputCtxt = inputCtxt;
+    conv->outputCtxt = outputCtxt;
+
+    return XML_ERR_OK;
+
+error:
+    if (inputCtxt != NULL)
+        icuClose(inputCtxt);
+    if (outputCtxt != NULL)
+        icuClose(outputCtxt);
+    return ret;
+}
+
+int
+main(void) {
+    xmlParserCtxtPtr ctxt;
+    xmlDocPtr doc;
+    const char *xml;
+    xmlChar *content;
+    int ret = 0;
+
+    /*
+     * We use IBM-1051, an alias for HP Roman, as a simple example that
+     * ICU supports, but iconv (typically) doesn't.
+     *
+     * Character code 0xDE is U+00DF Latin Small Letter Sharp S.
+     */
+    xml = "<doc>\xDE</doc>";
+
+    ctxt = xmlNewParserCtxt();
+    xmlCtxtSetCharEncConvImpl(ctxt, icuConvImpl, NULL);
+    doc = xmlCtxtReadDoc(ctxt, BAD_CAST xml, NULL, "IBM-1051", 0);
+    xmlFreeParserCtxt(ctxt);
+
+    content = xmlNodeGetContent((xmlNodePtr) doc);
+
+    printf("content: %s\n", content);
+
+    if (!xmlStrEqual(content, BAD_CAST "\xC3\x9F")) {
+        fprintf(stderr, "converison failed\n");
+        ret = 1;
+    }
+
+    xmlFree(content);
+    xmlFreeDoc(doc);
+
+    return ret;
+}
+

local-test-libxml2-delta-01/afc-libxml2/example/io1.c

@@ -0,0 +1,159 @@
+/**
+ * section: InputOutput
+ * synopsis: Example of custom Input/Output
+ * purpose: Demonstrate the use of xmlRegisterInputCallbacks
+ *          to build a custom I/O layer, this is used in an
+ *          XInclude method context to show how dynamic document can
+ *          be built in a clean way.
+ * usage: io1
+ * test: io1 > io1.tmp && diff io1.tmp $(srcdir)/io1.res
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xinclude.h>
+#include <libxml/xmlIO.h>
+
+#ifdef LIBXML_XINCLUDE_ENABLED
+static const char *result = "<list><people>a</people><people>b</people></list>";
+static const char *cur = NULL;
+static int rlen;
+
+/**
+ * sqlMatch:
+ * @URI: an URI to test
+ *
+ * Check for an sql: query
+ *
+ * Returns 1 if yes and 0 if another Input module should be used
+ */
+static int
+sqlMatch(const char * URI) {
+    if ((URI != NULL) && (!strncmp(URI, "sql:", 4)))
+        return(1);
+    return(0);
+}
+
+/**
+ * sqlOpen:
+ * @URI: an URI to test
+ *
+ * Return a pointer to the sql: query handler, in this example simply
+ * the current pointer...
+ *
+ * Returns an Input context or NULL in case or error
+ */
+static void *
+sqlOpen(const char * URI) {
+    if ((URI == NULL) || (strncmp(URI, "sql:", 4)))
+        return(NULL);
+    cur = result;
+    rlen = strlen(result);
+    return((void *) cur);
+}
+
+/**
+ * sqlClose:
+ * @context: the read context
+ *
+ * Close the sql: query handler
+ *
+ * Returns 0 or -1 in case of error
+ */
+static int
+sqlClose(void * context) {
+    if (context == NULL) return(-1);
+    cur = NULL;
+    rlen = 0;
+    return(0);
+}
+
+/**
+ * sqlRead:
+ * @context: the read context
+ * @buffer: where to store data
+ * @len: number of bytes to read
+ *
+ * Implement an sql: query read.
+ *
+ * Returns the number of bytes read or -1 in case of error
+ */
+static int
+sqlRead(void * context, char * buffer, int len) {
+   const char *ptr = (const char *) context;
+
+   if ((context == NULL) || (buffer == NULL) || (len < 0))
+       return(-1);
+
+   if (len > rlen) len = rlen;
+   memcpy(buffer, ptr, len);
+   rlen -= len;
+   return(len);
+}
+
+const char *include = "<?xml version='1.0'?>\n\
+<document xmlns:xi=\"http://www.w3.org/2003/XInclude\">\n\
+  <p>List of people:</p>\n\
+  <xi:include href=\"sql:select_name_from_people\"/>\n\
+</document>\n";
+
+int main(void) {
+    xmlDocPtr doc;
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    /*
+     * register the new I/O handlers
+     */
+    if (xmlRegisterInputCallbacks(sqlMatch, sqlOpen, sqlRead, sqlClose) < 0) {
+        fprintf(stderr, "failed to register SQL handler\n");
+	exit(1);
+    }
+    /*
+     * parse include into a document
+     */
+    doc = xmlReadMemory(include, strlen(include), "include.xml", NULL, 0);
+    if (doc == NULL) {
+        fprintf(stderr, "failed to parse the including file\n");
+	exit(1);
+    }
+
+    /*
+     * apply the XInclude process, this should trigger the I/O just
+     * registered.
+     */
+    if (xmlXIncludeProcess(doc) <= 0) {
+        fprintf(stderr, "XInclude processing failed\n");
+	exit(1);
+    }
+
+#ifdef LIBXML_OUTPUT_ENABLED
+    /*
+     * save the output for checking to stdout
+     */
+    xmlDocDump(stdout, doc);
+#endif
+
+    /*
+     * Free the document
+     */
+    xmlFreeDoc(doc);
+
+    return(0);
+}
+#else
+int main(void) {
+    fprintf(stderr, "XInclude support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/io2.c

@@ -0,0 +1,58 @@
+/**
+ * section: InputOutput
+ * synopsis: Output to char buffer
+ * purpose: Demonstrate the use of xmlDocDumpMemory
+ *          to output document to a character buffer
+ * usage: io2
+ * test: io2 > io2.tmp && diff io2.tmp $(srcdir)/io2.res
+ * author: John Fleck
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <libxml/parser.h>
+
+#if defined(LIBXML_OUTPUT_ENABLED)
+int
+main(void)
+{
+
+    xmlNodePtr n;
+    xmlDocPtr doc;
+    xmlChar *xmlbuff;
+    int buffersize;
+
+    /*
+     * Create the document.
+     */
+    doc = xmlNewDoc(BAD_CAST "1.0");
+    n = xmlNewDocNode(doc, NULL, BAD_CAST "root", NULL);
+    xmlNodeSetContent(n, BAD_CAST "content");
+    xmlDocSetRootElement(doc, n);
+
+    /*
+     * Dump the document to a buffer and print it
+     * for demonstration purposes.
+     */
+    xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1);
+    printf("%s", (char *) xmlbuff);
+
+    /*
+     * Free associated memory.
+     */
+    xmlFree(xmlbuff);
+    xmlFreeDoc(doc);
+
+    return (0);
+
+}
+#else
+#include <stdio.h>
+
+int
+main(void)
+{
+    fprintf(stderr,
+            "library not configured with output support\n");
+    return (0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/meson.build

@@ -0,0 +1,27 @@
+examples = [
+    'gjobread',
+    'io1',
+    'io2',
+    'parse1',
+    'parse2',
+    'parse3',
+    'parse4',
+    'reader1',
+    'reader2',
+    'reader3',
+    'reader4',
+    'testWriter',
+    'tree1',
+    'tree2',
+    'xpath1',
+    'xpath2',
+]
+
+foreach example : examples
+    exe = executable(
+        example,
+        files(example + '.c'),
+        dependencies: xml_dep,
+        include_directories: config_dir,
+    )
+endforeach

local-test-libxml2-delta-01/afc-libxml2/example/parse1.c

@@ -0,0 +1,48 @@
+/**
+ * section: Parsing
+ * synopsis: Parse an XML file to a tree and free it
+ * purpose: Demonstrate the use of xmlReadFile() to read an XML file
+ *          into a tree and xmlFreeDoc() to free the resulting tree
+ * usage: parse1 test1.xml
+ * test: parse1 test1.xml
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+/**
+ * example1Func:
+ * @filename: a filename or an URL
+ *
+ * Parse the resource and free the resulting tree
+ */
+static void
+example1Func(const char *filename) {
+    xmlDocPtr doc; /* the resulting document tree */
+
+    doc = xmlReadFile(filename, NULL, 0);
+    if (doc == NULL) {
+        fprintf(stderr, "Failed to parse %s\n", filename);
+	return;
+    }
+    xmlFreeDoc(doc);
+}
+
+int main(int argc, char **argv) {
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    example1Func(argv[1]);
+
+    return(0);
+}

local-test-libxml2-delta-01/afc-libxml2/example/parse2.c

@@ -0,0 +1,64 @@
+/**
+ * section: Parsing
+ * synopsis: Parse and validate an XML file to a tree and free the result
+ * purpose: Create a parser context for an XML file, then parse and validate
+ *          the file, creating a tree, check the validation result
+ *          and xmlFreeDoc() to free the resulting tree.
+ * usage: parse2 test2.xml
+ * test: parse2 test2.xml
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+/**
+ * exampleFunc:
+ * @filename: a filename or an URL
+ *
+ * Parse and validate the resource and free the resulting tree
+ */
+static void
+exampleFunc(const char *filename) {
+    xmlParserCtxtPtr ctxt; /* the parser context */
+    xmlDocPtr doc; /* the resulting document tree */
+
+    /* create a parser context */
+    ctxt = xmlNewParserCtxt();
+    if (ctxt == NULL) {
+        fprintf(stderr, "Failed to allocate parser context\n");
+	return;
+    }
+    /* parse the file, activating the DTD validation option */
+    doc = xmlCtxtReadFile(ctxt, filename, NULL, XML_PARSE_DTDVALID);
+    /* check if parsing succeeded */
+    if (doc == NULL) {
+        fprintf(stderr, "Failed to parse %s\n", filename);
+    } else {
+	/* check if validation succeeded */
+        if (ctxt->valid == 0)
+	    fprintf(stderr, "Failed to validate %s\n", filename);
+	/* free up the resulting document */
+	xmlFreeDoc(doc);
+    }
+    /* free up the parser context */
+    xmlFreeParserCtxt(ctxt);
+}
+
+int main(int argc, char **argv) {
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    exampleFunc(argv[1]);
+
+    return(0);
+}

local-test-libxml2-delta-01/afc-libxml2/example/parse3.c

@@ -0,0 +1,52 @@
+/**
+ * section: Parsing
+ * synopsis: Parse an XML document in memory to a tree and free it
+ * purpose: Demonstrate the use of xmlReadMemory() to read an XML file
+ *          into a tree and xmlFreeDoc() to free the resulting tree
+ * usage: parse3
+ * test: parse3
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+static const char *document = "<doc/>";
+
+/**
+ * example3Func:
+ * @content: the content of the document
+ * @length: the length in bytes
+ *
+ * Parse the in memory document and free the resulting tree
+ */
+static void
+example3Func(const char *content, int length) {
+    xmlDocPtr doc; /* the resulting document tree */
+
+    /*
+     * The document being in memory, it have no base per RFC 2396,
+     * and the "noname.xml" argument will serve as its base.
+     */
+    doc = xmlReadMemory(content, length, "noname.xml", NULL, 0);
+    if (doc == NULL) {
+        fprintf(stderr, "Failed to parse document\n");
+	return;
+    }
+    xmlFreeDoc(doc);
+}
+
+int main(void) {
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    example3Func(document, 6);
+
+    return(0);
+}

local-test-libxml2-delta-01/afc-libxml2/example/parse4.c

@@ -0,0 +1,135 @@
+/**
+ * section: Parsing
+ * synopsis: Parse an XML document chunk by chunk to a tree and free it
+ * purpose: Demonstrate the use of xmlCreatePushParserCtxt() and
+ *          xmlParseChunk() to read an XML file progressively
+ *          into a tree and xmlFreeDoc() to free the resulting tree
+ * usage: parse4 test3.xml
+ * test: parse4 test3.xml
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_PUSH_ENABLED
+static FILE *desc;
+
+/**
+ * readPacket:
+ * @mem: array to store the packet
+ * @size: the packet size
+ *
+ * read at most @size bytes from the document and store it in @mem
+ *
+ * Returns the number of bytes read
+ */
+static int
+readPacket(char *mem, int size) {
+    int res;
+
+    res = fread(mem, 1, size, desc);
+    return(res);
+}
+
+/**
+ * example4Func:
+ * @filename: a filename or an URL
+ *
+ * Parse the resource and free the resulting tree
+ */
+static void
+example4Func(const char *filename) {
+    xmlParserCtxtPtr ctxt;
+    char chars[4];
+    xmlDocPtr doc; /* the resulting document tree */
+    int res;
+
+    /*
+     * Read a few first byte to check the input used for the
+     * encoding detection at the parser level.
+     */
+    res = readPacket(chars, 4);
+    if (res <= 0) {
+        fprintf(stderr, "Failed to parse %s\n", filename);
+	return;
+    }
+
+    /*
+     * Create a progressive parsing context, the 2 first arguments
+     * are not used since we want to build a tree and not use a SAX
+     * parsing interface. We also pass the first bytes of the document
+     * to allow encoding detection when creating the parser but this
+     * is optional.
+     */
+    ctxt = xmlCreatePushParserCtxt(NULL, NULL,
+                                   chars, res, filename);
+    if (ctxt == NULL) {
+        fprintf(stderr, "Failed to create parser context !\n");
+	return;
+    }
+
+    /*
+     * loop on the input getting the document data, of course 4 bytes
+     * at a time is not realistic but allows to verify testing on small
+     * documents.
+     */
+    while ((res = readPacket(chars, 4)) > 0) {
+        xmlParseChunk(ctxt, chars, res, 0);
+    }
+
+    /*
+     * there is no more input, indicate the parsing is finished.
+     */
+    xmlParseChunk(ctxt, chars, 0, 1);
+
+    /*
+     * collect the document back and if it was wellformed
+     * and destroy the parser context.
+     */
+    doc = ctxt->myDoc;
+    res = ctxt->wellFormed;
+    xmlFreeParserCtxt(ctxt);
+
+    if (!res) {
+        fprintf(stderr, "Failed to parse %s\n", filename);
+    }
+
+    /*
+     * since we don't use the document, destroy it now.
+     */
+    xmlFreeDoc(doc);
+}
+
+int main(int argc, char **argv) {
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    /*
+     * simulate a progressive parsing using the input file.
+     */
+    desc = fopen(argv[1], "rb");
+    if (desc != NULL) {
+	example4Func(argv[1]);
+	fclose(desc);
+    } else {
+        fprintf(stderr, "Failed to parse %s\n", argv[1]);
+    }
+
+    return(0);
+}
+#else /* ! LIBXML_PUSH_ENABLED */
+int main(void) {
+    fprintf(stderr, "Library not compiled with push parser support\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/reader1.c

@@ -0,0 +1,99 @@
+/**
+ * section: xmlReader
+ * synopsis: Parse an XML file with an xmlReader
+ * purpose: Demonstrate the use of xmlReaderForFile() to parse an XML file
+ *          and dump the information about the nodes found in the process.
+ *          (Note that the XMLReader functions require libxml2 version later
+ *          than 2.6.)
+ * usage: reader1 <filename>
+ * test: reader1 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/xmlreader.h>
+
+#ifdef LIBXML_READER_ENABLED
+
+/**
+ * processNode:
+ * @reader: the xmlReader
+ *
+ * Dump information about the current node
+ */
+static void
+processNode(xmlTextReaderPtr reader) {
+    const xmlChar *name, *value;
+
+    name = xmlTextReaderConstName(reader);
+    if (name == NULL)
+	name = BAD_CAST "--";
+
+    value = xmlTextReaderConstValue(reader);
+
+    printf("%d %d %s %d %d", 
+	    xmlTextReaderDepth(reader),
+	    xmlTextReaderNodeType(reader),
+	    name,
+	    xmlTextReaderIsEmptyElement(reader),
+	    xmlTextReaderHasValue(reader));
+    if (value == NULL)
+	printf("\n");
+    else {
+        if (xmlStrlen(value) > 40)
+            printf(" %.40s...\n", value);
+        else
+	    printf(" %s\n", value);
+    }
+}
+
+/**
+ * streamFile:
+ * @filename: the file name to parse
+ *
+ * Parse and print information about an XML file.
+ */
+static void
+streamFile(const char *filename) {
+    xmlTextReaderPtr reader;
+    int ret;
+
+    reader = xmlReaderForFile(filename, NULL, 0);
+    if (reader != NULL) {
+        ret = xmlTextReaderRead(reader);
+        while (ret == 1) {
+            processNode(reader);
+            ret = xmlTextReaderRead(reader);
+        }
+        xmlFreeTextReader(reader);
+        if (ret != 0) {
+            fprintf(stderr, "%s : failed to parse\n", filename);
+        }
+    } else {
+        fprintf(stderr, "Unable to open %s\n", filename);
+    }
+}
+
+int main(int argc, char **argv) {
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    streamFile(argv[1]);
+
+    return(0);
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "XInclude support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/reader2.c

@@ -0,0 +1,115 @@
+/**
+ * section: xmlReader
+ * synopsis: Parse and validate an XML file with an xmlReader
+ * purpose: Demonstrate the use of xmlReaderForFile() to parse an XML file
+ *          validating the content in the process and activating options
+ *          like entities substitution, and DTD attributes defaulting.
+ *          (Note that the XMLReader functions require libxml2 version later
+ *          than 2.6.)
+ * usage: reader2 <valid_xml_filename>
+ * test: reader2 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/xmlreader.h>
+#include <libxml/parser.h>
+
+#ifdef LIBXML_READER_ENABLED
+
+/**
+ * processNode:
+ * @reader: the xmlReader
+ *
+ * Dump information about the current node
+ */
+static void
+processNode(xmlTextReaderPtr reader) {
+    const xmlChar *name, *value;
+
+    name = xmlTextReaderConstName(reader);
+    if (name == NULL)
+	name = BAD_CAST "--";
+
+    value = xmlTextReaderConstValue(reader);
+
+    printf("%d %d %s %d %d", 
+	    xmlTextReaderDepth(reader),
+	    xmlTextReaderNodeType(reader),
+	    name,
+	    xmlTextReaderIsEmptyElement(reader),
+	    xmlTextReaderHasValue(reader));
+    if (value == NULL)
+	printf("\n");
+    else {
+        if (xmlStrlen(value) > 40)
+            printf(" %.40s...\n", value);
+        else
+	    printf(" %s\n", value);
+    }
+}
+
+/**
+ * streamFile:
+ * @filename: the file name to parse
+ *
+ * Parse, validate and print information about an XML file.
+ */
+static void
+streamFile(const char *filename) {
+    xmlTextReaderPtr reader;
+    int ret;
+
+
+    /*
+     * Pass some special parsing options to activate DTD attribute defaulting,
+     * entities substitution and DTD validation
+     */
+    reader = xmlReaderForFile(filename, NULL,
+                 XML_PARSE_DTDATTR |  /* default DTD attributes */
+		 XML_PARSE_NOENT |    /* substitute entities */
+		 XML_PARSE_DTDVALID); /* validate with the DTD */
+    if (reader != NULL) {
+        ret = xmlTextReaderRead(reader);
+        while (ret == 1) {
+            processNode(reader);
+            ret = xmlTextReaderRead(reader);
+        }
+	/*
+	 * Once the document has been fully parsed check the validation results
+	 */
+	if (xmlTextReaderIsValid(reader) != 1) {
+	    fprintf(stderr, "Document %s does not validate\n", filename);
+	}
+        xmlFreeTextReader(reader);
+        if (ret != 0) {
+            fprintf(stderr, "%s : failed to parse\n", filename);
+        }
+    } else {
+        fprintf(stderr, "Unable to open %s\n", filename);
+    }
+}
+
+int main(int argc, char **argv) {
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    streamFile(argv[1]);
+
+    return(0);
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "XInclude support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/reader3.c

@@ -0,0 +1,111 @@
+/**
+ * section: xmlReader
+ * synopsis: Show how to extract subdocuments with xmlReader
+ * purpose: Demonstrate the use of xmlTextReaderPreservePattern() 
+ *          to parse an XML file with the xmlReader while collecting
+ *          only some subparts of the document.
+ *          (Note that the XMLReader functions require libxml2 version later
+ *          than 2.6.)
+ * usage: reader3
+ * test: reader3 > reader3.tmp && diff reader3.tmp $(srcdir)/reader3.res
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/xmlreader.h>
+
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
+
+
+/**
+ * streamFile:
+ * @filename: the file name to parse
+ *
+ * Parse and print information about an XML file.
+ *
+ * Returns the resulting doc with just the elements preserved.
+ */
+static xmlDocPtr
+extractFile(const char *filename, const xmlChar *pattern) {
+    xmlDocPtr doc;
+    xmlTextReaderPtr reader;
+    int ret;
+
+    /*
+     * build an xmlReader for that file
+     */
+    reader = xmlReaderForFile(filename, NULL, 0);
+    if (reader != NULL) {
+        /*
+	 * add the pattern to preserve
+	 */
+        if (xmlTextReaderPreservePattern(reader, pattern, NULL) < 0) {
+            fprintf(stderr, "%s : failed add preserve pattern %s\n",
+	            filename, (const char *) pattern);
+	}
+	/*
+	 * Parse and traverse the tree, collecting the nodes in the process
+	 */
+        ret = xmlTextReaderRead(reader);
+        while (ret == 1) {
+            ret = xmlTextReaderRead(reader);
+        }
+        if (ret != 0) {
+            fprintf(stderr, "%s : failed to parse\n", filename);
+	    xmlFreeTextReader(reader);
+	    return(NULL);
+        }
+	/*
+	 * get the resulting nodes
+	 */
+	doc = xmlTextReaderCurrentDoc(reader);
+	/*
+	 * Free up the reader
+	 */
+        xmlFreeTextReader(reader);
+    } else {
+        fprintf(stderr, "Unable to open %s\n", filename);
+	return(NULL);
+    }
+    return(doc);
+}
+
+int main(int argc, char **argv) {
+    const char *filename = "test3.xml";
+    const char *pattern = "preserved";
+    xmlDocPtr doc;
+
+    if (argc == 3) {
+        filename = argv[1];
+	pattern = argv[2];
+    }
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    doc = extractFile(filename, (const xmlChar *) pattern);
+    if (doc != NULL) {
+        /*
+	 * output the result.
+	 */
+        xmlDocDump(stdout, doc);
+	/*
+	 * don't forget to free up the doc
+	 */
+	xmlFreeDoc(doc);
+    }
+
+    return(0);
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "Reader, Pattern or output support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/reader4.c

@@ -0,0 +1,114 @@
+/**
+ * section: xmlReader
+ * synopsis: Parse multiple XML files reusing an xmlReader
+ * purpose: Demonstrate the use of xmlReaderForFile() and
+ * xmlReaderNewFile to parse XML files while reusing the reader object
+ * and parser context.  (Note that the XMLReader functions require
+ * libxml2 version later than 2.6.)
+ * usage: reader4 <filename> [ filename ... ]
+ * test: reader4 test1.xml test2.xml test3.xml > reader4.tmp && diff reader4.tmp $(srcdir)/reader4.res
+ * author: Graham Bennett
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml/xmlreader.h>
+
+#ifdef LIBXML_READER_ENABLED
+
+static void processDoc(xmlTextReaderPtr readerPtr) {
+    int ret;
+    xmlDocPtr docPtr;
+    const xmlChar *URL;
+
+    ret = xmlTextReaderRead(readerPtr);
+    while (ret == 1) {
+      ret = xmlTextReaderRead(readerPtr);
+    }
+
+    /*
+     * One can obtain the document pointer to get interesting
+     * information about the document like the URL, but one must also
+     * be sure to clean it up at the end (see below).
+     */
+    docPtr = xmlTextReaderCurrentDoc(readerPtr);
+    if (NULL == docPtr) {
+      fprintf(stderr, "failed to obtain document\n");      
+      return;
+    }
+      
+    URL = docPtr->URL;
+    if (NULL == URL) {
+      fprintf(stderr, "Failed to obtain URL\n");      
+    }
+
+    if (ret != 0) {
+      fprintf(stderr, "%s: Failed to parse\n", URL);
+      return;
+    }
+
+    printf("%s: Processed ok\n", (const char *)URL);
+}
+
+int main(int argc, char **argv) {
+    xmlTextReaderPtr readerPtr;
+    int i;
+    xmlDocPtr docPtr;
+
+    if (argc < 2)
+        return(1);
+
+    /*
+     * this initialises the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    /*
+     * Create a new reader for the first file and process the
+     * document.
+     */
+    readerPtr = xmlReaderForFile(argv[1], NULL, 0);
+    if (NULL == readerPtr) {
+      fprintf(stderr, "%s: failed to create reader\n", argv[1]);      
+      return(1);
+    }
+    processDoc(readerPtr);
+
+    /*
+     * The reader can be reused for subsequent files.
+     */
+    for (i=2; i < argc; ++i) {
+      	xmlReaderNewFile(readerPtr, argv[i], NULL, 0);
+	if (NULL == readerPtr) {
+	  fprintf(stderr, "%s: failed to create reader\n", argv[i]);      
+	  return(1);
+	}
+        processDoc(readerPtr);
+    }
+
+    /*
+     * Since we've called xmlTextReaderCurrentDoc, we now have to
+     * clean up after ourselves.  We only have to do this the last
+     * time, because xmlReaderNewFile calls xmlCtxtReset which takes
+     * care of it.
+     */
+    docPtr = xmlTextReaderCurrentDoc(readerPtr);
+    if (docPtr != NULL)
+      xmlFreeDoc(docPtr);
+
+    /*
+     * Clean up the reader.
+     */
+    xmlFreeTextReader(readerPtr);
+
+    return(0);
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "xmlReader support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/test1.xml

@@ -0,0 +1 @@
+<doc/>

local-test-libxml2-delta-01/afc-libxml2/example/test2.xml

@@ -0,0 +1,13 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (src | dest)*>
+<!ELEMENT src EMPTY>
+<!ELEMENT dest EMPTY>
+<!ATTLIST src ref IDREF #IMPLIED>
+<!ATTLIST dest id ID #IMPLIED>
+]>
+<doc>
+  <src ref="foo"/>
+  <dest id="foo"/>
+  <src ref="foo"/>
+</doc>
+

local-test-libxml2-delta-01/afc-libxml2/example/test3.xml

@@ -0,0 +1,39 @@
+<doc>
+  <parent>
+    <discarded>
+      <discarded/>
+    </discarded>
+    <preserved/>
+    This text node must be discarded
+    <discarded>
+      <discarded/>
+    </discarded>
+    <preserved>
+      content1
+      <child1></child1>
+      <child2>content2</child2>
+      <preserved>too</preserved>
+      <child2>content3</child2>
+      <preserved></preserved>
+      <child2>content4</child2>
+      <preserved/>
+      <child2>content5</child2>
+      content6
+    </preserved>
+    This text node must be discarded
+    <discarded>
+      <discarded/>
+    </discarded>
+    This text node must be discarded
+    <preserved></preserved>
+    This text node must be discarded
+    <preserved/>
+    This text node must be discarded
+    <discarded>
+      <discarded/>
+    </discarded>
+    This text node must be discarded
+  </parent>
+</doc>
+
+      

local-test-libxml2-delta-01/afc-libxml2/example/testWriter.c

@@ -0,0 +1,1068 @@
+/**
+ * section: xmlWriter
+ * synopsis: use various APIs for the xmlWriter
+ * purpose: tests a number of APIs for the xmlWriter, especially
+ *          the various methods to write to a filename, to a memory
+ *          buffer, to a new document, or to a subtree. It shows how to
+ *          do encoding string conversions too. The resulting
+ *          documents are then serialized.
+ * usage: testWriter
+ * test: testWriter && for i in 1 2 3 4 ; do diff $(srcdir)/writer.xml writer$$i.tmp || break ; done
+ * author: Alfred Mickautsch
+ * copy: see Copyright for the status of this software.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <libxml/encoding.h>
+#include <libxml/xmlwriter.h>
+#include <libxml/parser.h>
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#if defined(LIBXML_WRITER_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
+
+#define MY_ENCODING "ISO-8859-1"
+
+void testXmlwriterFilename(const char *uri);
+void testXmlwriterMemory(void);
+void testXmlwriterDoc(void);
+void testXmlwriterTree(void);
+
+int
+main(void)
+{
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    /* first, the file version */
+    testXmlwriterFilename("writer1.tmp");
+    unlink("writer1.tmp");
+
+    /* next, the memory version */
+    testXmlwriterMemory();
+
+    /* next, the DOM version */
+    testXmlwriterDoc();
+
+    /* next, the tree version */
+    testXmlwriterTree();
+
+    return 0;
+}
+
+/**
+ * testXmlwriterFilename:
+ * @uri: the output URI
+ *
+ * test the xmlWriter interface when writing to a new file
+ */
+void
+testXmlwriterFilename(const char *uri)
+{
+    int rc;
+    xmlTextWriterPtr writer;
+
+    /* Create a new XmlWriter for uri, with no compression. */
+    writer = xmlNewTextWriterFilename(uri, 0);
+    if (writer == NULL) {
+        printf("testXmlwriterFilename: Error creating the xml writer\n");
+        return;
+    }
+
+    /* Start the document with the xml default for the version,
+     * encoding ISO 8859-1 and the default for the standalone
+     * declaration. */
+    rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartDocument\n");
+        return;
+    }
+
+    /* Start an element named "EXAMPLE". Since this is the first
+     * element, this will be the root element of the document. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "EXAMPLE");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is a comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteComment\n");
+        return;
+    }
+
+    /* Start an element named "ORDER" as child of EXAMPLE. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ORDER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Add an attribute with name "version" and value "1.0" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "version",
+                                     BAD_CAST "1.0");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Add an attribute with name "xml:lang" and value "de" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "xml:lang",
+                                     BAD_CAST "de");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Write a comment as child of ORDER */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is another comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteFormatComment\n");
+        return;
+    }
+
+    /* Start an element named "HEADER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "HEADER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "X_ORDER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "X_ORDER_ID",
+                                         "%010d", 53535);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "CUSTOMER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CUSTOMER_ID",
+                                         "%d", 1010);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_1" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_1",
+                                   BAD_CAST "Mueller");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_2" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_2",
+                                   BAD_CAST "Joerg");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named HEADER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRIES" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRIES");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test>");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         10);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test 2>");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         20);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRIES. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "FOOTER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "FOOTER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "TEXT" as child of FOOTER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "TEXT",
+                                   BAD_CAST "This is a text.");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named FOOTER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Here we could close the elements ORDER and EXAMPLE using the
+     * function xmlTextWriterEndElement, but since we do not want to
+     * write any other elements, we simply call xmlTextWriterEndDocument,
+     * which will do all the work. */
+    rc = xmlTextWriterEndDocument(writer);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterFilename: Error at xmlTextWriterEndDocument\n");
+        return;
+    }
+
+    xmlFreeTextWriter(writer);
+}
+
+/**
+ * testXmlwriterMemory:
+ * @file: the output file
+ *
+ * test the xmlWriter interface when writing to memory
+ */
+void
+testXmlwriterMemory(void)
+{
+    int rc;
+    xmlTextWriterPtr writer;
+    xmlBufferPtr buf;
+
+    /* Create a new XML buffer, to which the XML document will be
+     * written */
+    buf = xmlBufferCreate();
+    if (buf == NULL) {
+        printf("testXmlwriterMemory: Error creating the xml buffer\n");
+        return;
+    }
+
+    /* Create a new XmlWriter for memory, with no compression.
+     * Remark: there is no compression for this kind of xmlTextWriter */
+    writer = xmlNewTextWriterMemory(buf, 0);
+    if (writer == NULL) {
+        printf("testXmlwriterMemory: Error creating the xml writer\n");
+        return;
+    }
+
+    /* Start the document with the xml default for the version,
+     * encoding ISO 8859-1 and the default for the standalone
+     * declaration. */
+    rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartDocument\n");
+        return;
+    }
+
+    /* Start an element named "EXAMPLE". Since this is the first
+     * element, this will be the root element of the document. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "EXAMPLE");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write a comment as child of EXAMPLE. */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is a comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteComment\n");
+        return;
+    }
+
+    /* Start an element named "ORDER" as child of EXAMPLE. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ORDER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Add an attribute with name "version" and value "1.0" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "version",
+                                     BAD_CAST "1.0");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Add an attribute with name "xml:lang" and value "de" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "xml:lang",
+                                     BAD_CAST "de");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Write a comment as child of ORDER */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is another comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteFormatComment\n");
+        return;
+    }
+
+    /* Start an element named "HEADER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "HEADER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "X_ORDER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "X_ORDER_ID",
+                                         "%010d", 53535);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "CUSTOMER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CUSTOMER_ID",
+                                         "%d", 1010);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_1" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_1",
+                                   BAD_CAST "Mueller");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_2" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_2",
+                                   BAD_CAST "Joerg");
+
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named HEADER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRIES" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRIES");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test>");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         10);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test 2>");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         20);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRIES. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "FOOTER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "FOOTER");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "TEXT" as child of FOOTER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "TEXT",
+                                   BAD_CAST "This is a text.");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterMemory: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named FOOTER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Here we could close the elements ORDER and EXAMPLE using the
+     * function xmlTextWriterEndElement, but since we do not want to
+     * write any other elements, we simply call xmlTextWriterEndDocument,
+     * which will do all the work. */
+    rc = xmlTextWriterEndDocument(writer);
+    if (rc < 0) {
+        printf("testXmlwriterMemory: Error at xmlTextWriterEndDocument\n");
+        return;
+    }
+
+    xmlFreeTextWriter(writer);
+
+    xmlBufferFree(buf);
+}
+
+/**
+ * testXmlwriterDoc:
+ * @file: the output file
+ *
+ * test the xmlWriter interface when creating a new document
+ */
+void
+testXmlwriterDoc(void)
+{
+    int rc;
+    xmlTextWriterPtr writer;
+    xmlDocPtr doc;
+
+
+    /* Create a new XmlWriter for DOM, with no compression. */
+    writer = xmlNewTextWriterDoc(&doc, 0);
+    if (writer == NULL) {
+        printf("testXmlwriterDoc: Error creating the xml writer\n");
+        return;
+    }
+
+    /* Start the document with the xml default for the version,
+     * encoding ISO 8859-1 and the default for the standalone
+     * declaration. */
+    rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartDocument\n");
+        return;
+    }
+
+    /* Start an element named "EXAMPLE". Since this is the first
+     * element, this will be the root element of the document. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "EXAMPLE");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write a comment as child of EXAMPLE. */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is a comment");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteComment\n");
+        return;
+    }
+
+    /* Start an element named "ORDER" as child of EXAMPLE. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ORDER");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Add an attribute with name "version" and value "1.0" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "version",
+                                     BAD_CAST "1.0");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Add an attribute with name "xml:lang" and value "de" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "xml:lang",
+                                     BAD_CAST "de");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Write a comment as child of ORDER */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is another comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterDoc: Error at xmlTextWriterWriteFormatComment\n");
+        return;
+    }
+
+    /* Start an element named "HEADER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "HEADER");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "X_ORDER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "X_ORDER_ID",
+                                         "%010d", 53535);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterDoc: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "CUSTOMER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CUSTOMER_ID",
+                                         "%d", 1010);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterDoc: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_1" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_1",
+                                   BAD_CAST "Mueller");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_2" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_2",
+                                   BAD_CAST "Joerg");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named HEADER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRIES" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRIES");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test>");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         10);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterDoc: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test 2>");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         20);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterDoc: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRIES. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "FOOTER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "FOOTER");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "TEXT" as child of FOOTER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "TEXT",
+                                   BAD_CAST "This is a text.");
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named FOOTER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Here we could close the elements ORDER and EXAMPLE using the
+     * function xmlTextWriterEndElement, but since we do not want to
+     * write any other elements, we simply call xmlTextWriterEndDocument,
+     * which will do all the work. */
+    rc = xmlTextWriterEndDocument(writer);
+    if (rc < 0) {
+        printf("testXmlwriterDoc: Error at xmlTextWriterEndDocument\n");
+        return;
+    }
+
+    xmlFreeTextWriter(writer);
+
+    xmlFreeDoc(doc);
+}
+
+/**
+ * testXmlwriterTree:
+ * @file: the output file
+ *
+ * test the xmlWriter interface when writing to a subtree
+ */
+void
+testXmlwriterTree(void)
+{
+    int rc;
+    xmlTextWriterPtr writer;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+
+    /* Create a new XML DOM tree, to which the XML document will be
+     * written */
+    doc = xmlNewDoc(BAD_CAST XML_DEFAULT_VERSION);
+    if (doc == NULL) {
+        printf
+            ("testXmlwriterTree: Error creating the xml document tree\n");
+        return;
+    }
+
+    /* Create a new XML node, to which the XML document will be
+     * appended */
+    node = xmlNewDocNode(doc, NULL, BAD_CAST "EXAMPLE", NULL);
+    if (node == NULL) {
+        printf("testXmlwriterTree: Error creating the xml node\n");
+        return;
+    }
+
+    /* Make ELEMENT the root node of the tree */
+    xmlDocSetRootElement(doc, node);
+
+    /* Create a new XmlWriter for DOM tree, with no compression. */
+    writer = xmlNewTextWriterTree(doc, node, 0);
+    if (writer == NULL) {
+        printf("testXmlwriterTree: Error creating the xml writer\n");
+        return;
+    }
+
+    /* Start the document with the xml default for the version,
+     * encoding ISO 8859-1 and the default for the standalone
+     * declaration. */
+    rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartDocument\n");
+        return;
+    }
+
+    /* Write a comment as child of EXAMPLE. */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is a comment");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteComment\n");
+        return;
+    }
+
+    /* Start an element named "ORDER" as child of EXAMPLE. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ORDER");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Add an attribute with name "version" and value "1.0" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "version",
+                                     BAD_CAST "1.0");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Add an attribute with name "xml:lang" and value "de" to ORDER. */
+    rc = xmlTextWriterWriteAttribute(writer, BAD_CAST "xml:lang",
+                                     BAD_CAST "de");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteAttribute\n");
+        return;
+    }
+
+    /* Write a comment as child of ORDER */
+    rc = xmlTextWriterWriteComment(writer, BAD_CAST "This is another comment");
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteFormatComment\n");
+        return;
+    }
+
+    /* Start an element named "HEADER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "HEADER");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "X_ORDER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "X_ORDER_ID",
+                                         "%010d", 53535);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "CUSTOMER_ID" as child of HEADER. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CUSTOMER_ID",
+                                         "%d", 1010);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_1" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_1",
+                                   BAD_CAST "Mueller");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "NAME_2" as child of HEADER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "NAME_2",
+                                   BAD_CAST "Joerg");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named HEADER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRIES" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRIES");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test>");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         10);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "ENTRY" as child of ENTRIES. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "ENTRY");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "ARTICLE" as child of ENTRY. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "ARTICLE",
+                                   BAD_CAST "<Test 2>");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Write an element named "ENTRY_NO" as child of ENTRY. */
+    rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ENTRY_NO", "%d",
+                                         20);
+    if (rc < 0) {
+        printf
+            ("testXmlwriterTree: Error at xmlTextWriterWriteFormatElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRY. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Close the element named ENTRIES. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Start an element named "FOOTER" as child of ORDER. */
+    rc = xmlTextWriterStartElement(writer, BAD_CAST "FOOTER");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterStartElement\n");
+        return;
+    }
+
+    /* Write an element named "TEXT" as child of FOOTER. */
+    rc = xmlTextWriterWriteElement(writer, BAD_CAST "TEXT",
+                                   BAD_CAST "This is a text.");
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterWriteElement\n");
+        return;
+    }
+
+    /* Close the element named FOOTER. */
+    rc = xmlTextWriterEndElement(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndElement\n");
+        return;
+    }
+
+    /* Here we could close the elements ORDER and EXAMPLE using the
+     * function xmlTextWriterEndElement, but since we do not want to
+     * write any other elements, we simply call xmlTextWriterEndDocument,
+     * which will do all the work. */
+    rc = xmlTextWriterEndDocument(writer);
+    if (rc < 0) {
+        printf("testXmlwriterTree: Error at xmlTextWriterEndDocument\n");
+        return;
+    }
+
+    xmlFreeTextWriter(writer);
+
+    xmlFreeDoc(doc);
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "Writer or output support not compiled in\n");
+    return 0;
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/tree1.c

@@ -0,0 +1,80 @@
+/**
+ * section: Tree
+ * synopsis: Navigates a tree to print element names
+ * purpose: Parse a file to a tree, use xmlDocGetRootElement() to
+ *          get the root element, then walk the document and print
+ *          all the element name in document order.
+ * usage: tree1 filename_or_URL
+ * test: tree1 test2.xml > tree1.tmp && diff tree1.tmp $(srcdir)/tree1.res
+ * author: Dodji Seketeli
+ * copy: see Copyright for the status of this software.
+ */
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+/*
+ *To compile this file using gcc you can type
+ *gcc `xml2-config --cflags --libs` -o xmlexample libxml2-example.c
+ */
+
+/**
+ * print_element_names:
+ * @a_node: the initial xml node to consider.
+ *
+ * Prints the names of the all the xml elements
+ * that are siblings or children of a given xml node.
+ */
+static void
+print_element_names(xmlNode * a_node)
+{
+    xmlNode *cur_node = NULL;
+
+    for (cur_node = a_node; cur_node; cur_node = cur_node->next) {
+        if (cur_node->type == XML_ELEMENT_NODE) {
+            printf("node type: Element, name: %s\n", cur_node->name);
+        }
+
+        print_element_names(cur_node->children);
+    }
+}
+
+
+/**
+ * Simple example to parse a file called "file.xml", 
+ * walk down the DOM, and print the name of the 
+ * xml elements nodes.
+ */
+int
+main(int argc, char **argv)
+{
+    xmlDoc *doc = NULL;
+    xmlNode *root_element = NULL;
+
+    if (argc != 2)
+        return(1);
+
+    /*
+     * this initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION
+
+    /*parse the file and get the DOM */
+    doc = xmlReadFile(argv[1], NULL, 0);
+
+    if (doc == NULL) {
+        printf("error: could not parse file %s\n", argv[1]);
+    }
+
+    /*Get the root element node */
+    root_element = xmlDocGetRootElement(doc);
+
+    print_element_names(root_element);
+
+    /*free the document */
+    xmlFreeDoc(doc);
+
+    return 0;
+}

local-test-libxml2-delta-01/afc-libxml2/example/tree2.c

@@ -0,0 +1,107 @@
+/* 
+ * section:  Tree
+ * synopsis: Creates a tree
+ * purpose:  Shows how to create document, nodes and dump it to stdout or file.
+ * usage:    tree2 <filename>  -Default output: stdout
+ * test:     tree2 > tree2.tmp && diff tree2.tmp $(srcdir)/tree2.res
+ * author:   Lucas Brasilino <brasilino@recife.pe.gov.br>
+ * copy:     see Copyright for the status of this software
+ */
+
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#if defined(LIBXML_OUTPUT_ENABLED)
+
+/*
+ *To compile this file using gcc you can type
+ *gcc `xml2-config --cflags --libs` -o tree2 tree2.c
+ */
+
+/* A simple example how to create DOM. Libxml2 automagically 
+ * allocates the necessary amount of memory to it.
+*/
+int
+main(int argc, char **argv)
+{
+    xmlDocPtr doc = NULL;       /* document pointer */
+    xmlNodePtr root_node = NULL, node = NULL, node1 = NULL;/* node pointers */
+    char buff[256];
+    int i, j;
+
+    LIBXML_TEST_VERSION;
+
+    /* 
+     * Creates a new document, a node and set it as a root node
+     */
+    doc = xmlNewDoc(BAD_CAST "1.0");
+    root_node = xmlNewDocNode(doc, NULL, BAD_CAST "root", NULL);
+    xmlDocSetRootElement(doc, root_node);
+
+    /*
+     * Creates a DTD declaration. Isn't mandatory. 
+     */
+    xmlCreateIntSubset(doc, BAD_CAST "root", NULL, BAD_CAST "tree2.dtd");
+
+    /* 
+     * xmlNewChild() creates a new node, which is "attached" as child node
+     * of root_node node. 
+     */
+    xmlNewChild(root_node, NULL, BAD_CAST "node1",
+                BAD_CAST "content of node 1");
+    /* 
+     * The same as above, but the new child node doesn't have a content 
+     */
+    xmlNewChild(root_node, NULL, BAD_CAST "node2", NULL);
+
+    /* 
+     * xmlNewProp() creates attributes, which is "attached" to an node.
+     * It returns xmlAttrPtr, which isn't used here.
+     */
+    node =
+        xmlNewChild(root_node, NULL, BAD_CAST "node3",
+                    BAD_CAST "this node has attributes");
+    xmlNewProp(node, BAD_CAST "attribute", BAD_CAST "yes");
+    xmlNewProp(node, BAD_CAST "foo", BAD_CAST "bar");
+
+    /*
+     * Here goes another way to create nodes. xmlNewNode() and xmlNewText
+     * creates a node and a text node separately. They are "attached"
+     * by xmlAddChild() 
+     */
+    node = xmlNewDocNode(doc, NULL, BAD_CAST "node4", NULL);
+    node1 = xmlNewDocText(doc, BAD_CAST
+                   "other way to create content (which is also a node)");
+    xmlAddChild(node, node1);
+    xmlAddChild(root_node, node);
+
+    /* 
+     * A simple loop that "automates" nodes creation 
+     */
+    for (i = 5; i < 7; i++) {
+        snprintf(buff, sizeof(buff), "node%d", i);
+        node = xmlNewChild(root_node, NULL, BAD_CAST buff, NULL);
+        for (j = 1; j < 4; j++) {
+            snprintf(buff, sizeof(buff), "node%d%d", i, j);
+            node1 = xmlNewChild(node, NULL, BAD_CAST buff, NULL);
+            xmlNewProp(node1, BAD_CAST "odd", BAD_CAST((j % 2) ? "no" : "yes"));
+        }
+    }
+
+    /* 
+     * Dumping document to stdio or file
+     */
+    xmlSaveFormatFileEnc(argc > 1 ? argv[1] : "-", doc, "UTF-8", 1);
+
+    /*free the document */
+    xmlFreeDoc(doc);
+
+    return(0);
+}
+#else
+int main(void) {
+    fprintf(stderr, "output support not compiled in\n");
+    return(0);
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/xpath1.c

@@ -0,0 +1,243 @@
+/** 
+ * section: 	XPath
+ * synopsis: 	Evaluate XPath expression and prints result node set.
+ * purpose: 	Shows how to evaluate XPath expression and register 
+ *          	known namespaces in XPath context.
+ * usage:	xpath1 <xml-file> <xpath-expr> [<known-ns-list>]
+ * test:	xpath1 test3.xml '//child2' > xpath1.tmp && diff xpath1.tmp $(srcdir)/xpath1.res
+ * author: 	Aleksey Sanin
+ * copy: 	see Copyright for the status of this software.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_SAX1_ENABLED)
+
+
+static void usage(const char *name);
+int  execute_xpath_expression(const char* filename, const xmlChar* xpathExpr, const xmlChar* nsList);
+int  register_namespaces(xmlXPathContextPtr xpathCtx, const xmlChar* nsList);
+void print_xpath_nodes(xmlNodeSetPtr nodes, FILE* output);
+
+int 
+main(int argc, char **argv) {
+    /* Parse command line and process file */
+    if((argc < 3) || (argc > 4)) {
+	fprintf(stderr, "Error: wrong number of arguments.\n");
+	usage(argv[0]);
+	return(-1);
+    } 
+    
+    /* Init libxml */     
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
+    /* Do the main job */
+    if(execute_xpath_expression(argv[1], BAD_CAST argv[2], (argc > 3) ? BAD_CAST argv[3] : NULL) < 0) {
+	usage(argv[0]);
+	return(-1);
+    }
+
+    return 0;
+}
+
+/**
+ * usage:
+ * @name:		the program name.
+ *
+ * Prints usage information.
+ */
+static void 
+usage(const char *name) {
+    assert(name);
+    
+    fprintf(stderr, "Usage: %s <xml-file> <xpath-expr> [<known-ns-list>]\n", name);
+    fprintf(stderr, "where <known-ns-list> is a list of known namespaces\n");
+    fprintf(stderr, "in \"<prefix1>=<href1> <prefix2>=href2> ...\" format\n");
+}
+
+/**
+ * execute_xpath_expression:
+ * @filename:		the input XML filename.
+ * @xpathExpr:		the xpath expression for evaluation.
+ * @nsList:		the optional list of known namespaces in 
+ *			"<prefix1>=<href1> <prefix2>=href2> ..." format.
+ *
+ * Parses input XML file, evaluates XPath expression and prints results.
+ *
+ * Returns 0 on success and a negative value otherwise.
+ */
+int 
+execute_xpath_expression(const char* filename, const xmlChar* xpathExpr, const xmlChar* nsList) {
+    xmlDocPtr doc;
+    xmlXPathContextPtr xpathCtx; 
+    xmlXPathObjectPtr xpathObj; 
+    
+    assert(filename);
+    assert(xpathExpr);
+
+    /* Load XML document */
+    doc = xmlParseFile(filename);
+    if (doc == NULL) {
+	fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename);
+	return(-1);
+    }
+
+    /* Create xpath evaluation context */
+    xpathCtx = xmlXPathNewContext(doc);
+    if(xpathCtx == NULL) {
+        fprintf(stderr,"Error: unable to create new XPath context\n");
+        xmlFreeDoc(doc); 
+        return(-1);
+    }
+    
+    /* Register namespaces from list (if any) */
+    if((nsList != NULL) && (register_namespaces(xpathCtx, nsList) < 0)) {
+        fprintf(stderr,"Error: failed to register namespaces list \"%s\"\n", nsList);
+        xmlXPathFreeContext(xpathCtx); 
+        xmlFreeDoc(doc); 
+        return(-1);
+    }
+
+    /* Evaluate xpath expression */
+    xpathObj = xmlXPathEvalExpression(xpathExpr, xpathCtx);
+    if(xpathObj == NULL) {
+        fprintf(stderr,"Error: unable to evaluate xpath expression \"%s\"\n", xpathExpr);
+        xmlXPathFreeContext(xpathCtx); 
+        xmlFreeDoc(doc); 
+        return(-1);
+    }
+
+    /* Print results */
+    print_xpath_nodes(xpathObj->nodesetval, stdout);
+
+    /* Cleanup */
+    xmlXPathFreeObject(xpathObj);
+    xmlXPathFreeContext(xpathCtx); 
+    xmlFreeDoc(doc); 
+    
+    return(0);
+}
+
+/**
+ * register_namespaces:
+ * @xpathCtx:		the pointer to an XPath context.
+ * @nsList:		the list of known namespaces in 
+ *			"<prefix1>=<href1> <prefix2>=href2> ..." format.
+ *
+ * Registers namespaces from @nsList in @xpathCtx.
+ *
+ * Returns 0 on success and a negative value otherwise.
+ */
+int 
+register_namespaces(xmlXPathContextPtr xpathCtx, const xmlChar* nsList) {
+    xmlChar* nsListDup;
+    xmlChar* prefix;
+    xmlChar* href;
+    xmlChar* next;
+    
+    assert(xpathCtx);
+    assert(nsList);
+
+    nsListDup = xmlStrdup(nsList);
+    if(nsListDup == NULL) {
+	fprintf(stderr, "Error: unable to strdup namespaces list\n");
+	return(-1);	
+    }
+    
+    next = nsListDup; 
+    while(next != NULL) {
+	/* skip spaces */
+	while((*next) == ' ') next++;
+	if((*next) == '\0') break;
+
+	/* find prefix */
+	prefix = next;
+	next = (xmlChar*)xmlStrchr(next, '=');
+	if(next == NULL) {
+	    fprintf(stderr,"Error: invalid namespaces list format\n");
+	    xmlFree(nsListDup);
+	    return(-1);	
+	}
+	*(next++) = '\0';	
+	
+	/* find href */
+	href = next;
+	next = (xmlChar*)xmlStrchr(next, ' ');
+	if(next != NULL) {
+	    *(next++) = '\0';	
+	}
+
+	/* do register namespace */
+	if(xmlXPathRegisterNs(xpathCtx, prefix, href) != 0) {
+	    fprintf(stderr,"Error: unable to register NS with prefix=\"%s\" and href=\"%s\"\n", prefix, href);
+	    xmlFree(nsListDup);
+	    return(-1);	
+	}
+    }
+    
+    xmlFree(nsListDup);
+    return(0);
+}
+
+/**
+ * print_xpath_nodes:
+ * @nodes:		the nodes set.
+ * @output:		the output file handle.
+ *
+ * Prints the @nodes content to @output.
+ */
+void
+print_xpath_nodes(xmlNodeSetPtr nodes, FILE* output) {
+    xmlNodePtr cur;
+    int size;
+    int i;
+    
+    assert(output);
+    size = (nodes) ? nodes->nodeNr : 0;
+    
+    fprintf(output, "Result (%d nodes):\n", size);
+    for(i = 0; i < size; ++i) {
+	assert(nodes->nodeTab[i]);
+	
+	if(nodes->nodeTab[i]->type == XML_NAMESPACE_DECL) {
+	    xmlNsPtr ns;
+	    
+	    ns = (xmlNsPtr)nodes->nodeTab[i];
+	    cur = (xmlNodePtr)ns->next;
+	    if(cur->ns) { 
+	        fprintf(output, "= namespace \"%s\"=\"%s\" for node %s:%s\n", 
+		    ns->prefix, ns->href, cur->ns->href, cur->name);
+	    } else {
+	        fprintf(output, "= namespace \"%s\"=\"%s\" for node %s\n", 
+		    ns->prefix, ns->href, cur->name);
+	    }
+	} else if(nodes->nodeTab[i]->type == XML_ELEMENT_NODE) {
+	    cur = nodes->nodeTab[i];   	    
+	    if(cur->ns) { 
+    	        fprintf(output, "= element node \"%s:%s\"\n", 
+		    cur->ns->href, cur->name);
+	    } else {
+    	        fprintf(output, "= element node \"%s\"\n", 
+		    cur->name);
+	    }
+	} else {
+	    cur = nodes->nodeTab[i];    
+	    fprintf(output, "= node \"%s\": type %d\n", cur->name, cur->type);
+	}
+    }
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "XPath support not compiled in\n");
+    return 0;
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/example/xpath2.c

@@ -0,0 +1,183 @@
+/** 
+ * section: 	XPath
+ * synopsis: 	Load a document, locate subelements with XPath, modify
+ *              said elements and save the resulting document.
+ * purpose: 	Shows how to make a full round-trip from a load/edit/save
+ * usage:	xpath2 <xml-file> <xpath-expr> <new-value>
+ * test:	xpath2 test3.xml '//discarded' discarded > xpath2.tmp && diff xpath2.tmp $(srcdir)/xpath2.res
+ * author: 	Aleksey Sanin and Daniel Veillard
+ * copy: 	see Copyright for the status of this software.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_SAX1_ENABLED) && \
+    defined(LIBXML_OUTPUT_ENABLED)
+
+
+static void usage(const char *name);
+static int example4(const char *filename, const xmlChar * xpathExpr,
+                    const xmlChar * value);
+static void update_xpath_nodes(xmlNodeSetPtr nodes, const xmlChar * value);
+
+
+int 
+main(int argc, char **argv) {
+    /* Parse command line and process file */
+    if (argc != 4) {
+	fprintf(stderr, "Error: wrong number of arguments.\n");
+	usage(argv[0]);
+	return(-1);
+    } 
+    
+    /* Init libxml */     
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
+    /* Do the main job */
+    if (example4(argv[1], BAD_CAST argv[2], BAD_CAST argv[3])) {
+	usage(argv[0]);
+	return(-1);
+    }
+
+    return 0;
+}
+
+/**
+ * usage:
+ * @name:		the program name.
+ *
+ * Prints usage information.
+ */
+static void 
+usage(const char *name) {
+    assert(name);
+    
+    fprintf(stderr, "Usage: %s <xml-file> <xpath-expr> <value>\n", name);
+}
+
+/**
+ * example4:
+ * @filename:		the input XML filename.
+ * @xpathExpr:		the xpath expression for evaluation.
+ * @value:		the new node content.
+ *
+ * Parses input XML file, evaluates XPath expression and update the nodes
+ * then print the result.
+ *
+ * Returns 0 on success and a negative value otherwise.
+ */
+static int 
+example4(const char* filename, const xmlChar* xpathExpr, const xmlChar* value) {
+    xmlDocPtr doc;
+    xmlXPathContextPtr xpathCtx; 
+    xmlXPathObjectPtr xpathObj; 
+    
+    assert(filename);
+    assert(xpathExpr);
+    assert(value);
+
+    /* Load XML document */
+    doc = xmlParseFile(filename);
+    if (doc == NULL) {
+	fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename);
+	return(-1);
+    }
+
+    /* Create xpath evaluation context */
+    xpathCtx = xmlXPathNewContext(doc);
+    if(xpathCtx == NULL) {
+        fprintf(stderr,"Error: unable to create new XPath context\n");
+        xmlFreeDoc(doc); 
+        return(-1);
+    }
+    
+    /* Evaluate xpath expression */
+    xpathObj = xmlXPathEvalExpression(xpathExpr, xpathCtx);
+    if(xpathObj == NULL) {
+        fprintf(stderr,"Error: unable to evaluate xpath expression \"%s\"\n", xpathExpr);
+        xmlXPathFreeContext(xpathCtx); 
+        xmlFreeDoc(doc); 
+        return(-1);
+    }
+
+    /* update selected nodes */
+    update_xpath_nodes(xpathObj->nodesetval, value);
+
+    
+    /* Cleanup of XPath data */
+    xmlXPathFreeObject(xpathObj);
+    xmlXPathFreeContext(xpathCtx); 
+
+    /* dump the resulting document */
+    xmlDocDump(stdout, doc);
+
+
+    /* free the document */
+    xmlFreeDoc(doc); 
+    
+    return(0);
+}
+
+/**
+ * update_xpath_nodes:
+ * @nodes:		the nodes set.
+ * @value:		the new value for the node(s)
+ *
+ * Prints the @nodes content to @output.
+ */
+static void
+update_xpath_nodes(xmlNodeSetPtr nodes, const xmlChar* value) {
+    int size;
+    int i;
+    
+    assert(value);
+    size = (nodes) ? nodes->nodeNr : 0;
+    
+    /*
+     * NOTE: the nodes are processed in reverse order, i.e. reverse document
+     *       order because xmlNodeSetContent can actually free up descendant
+     *       of the node and such nodes may have been selected too ! Handling
+     *       in reverse order ensure that descendant are accessed first, before
+     *       they get removed. Mixing XPath and modifications on a tree must be
+     *       done carefully !
+     */
+    for(i = size - 1; i >= 0; i--) {
+	assert(nodes->nodeTab[i]);
+	
+	xmlNodeSetContent(nodes->nodeTab[i], value);
+	/*
+	 * All the elements returned by an XPath query are pointers to
+	 * elements from the tree *except* namespace nodes where the XPath
+	 * semantic is different from the implementation in libxml2 tree.
+	 * As a result when a returned node set is freed when
+	 * xmlXPathFreeObject() is called, that routine must check the
+	 * element type. But node from the returned set may have been removed
+	 * by xmlNodeSetContent() resulting in access to freed data.
+	 * This can be exercised by running
+	 *       valgrind xpath2 test3.xml '//discarded' discarded
+	 * There is 2 ways around it:
+	 *   - make a copy of the pointers to the nodes from the result set 
+	 *     then call xmlXPathFreeObject() and then modify the nodes
+	 * or
+	 *   - remove the reference to the modified nodes from the node set
+	 *     as they are processed, if they are not namespace nodes.
+	 */
+	if (nodes->nodeTab[i]->type != XML_NAMESPACE_DECL)
+	    nodes->nodeTab[i] = NULL;
+    }
+}
+
+#else
+int main(void) {
+    fprintf(stderr, "XPath support not compiled in\n");
+    return 0;
+}
+#endif

local-test-libxml2-delta-01/afc-libxml2/include/Makefile.am

@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+SUBDIRS=libxml private
+
+EXTRA_DIST = wsockcompat.h meson.build
+

local-test-libxml2-delta-01/afc-libxml2/include/meson.build

@@ -0,0 +1,2 @@
+
+inc_dir = include_directories('.')

local-test-libxml2-delta-01/afc-libxml2/include/wsockcompat.h

@@ -0,0 +1,49 @@
+/* include/wsockcompat.h
+ * Windows -> Berkeley Sockets compatibility things.
+ */
+
+#if !defined __XML_WSOCKCOMPAT_H__
+#define __XML_WSOCKCOMPAT_H__
+
+#include <errno.h>
+#include <winsock2.h>
+
+/* Fix for old MinGW. */
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_
+#endif
+
+/* the following is a workaround a problem for 'inline' keyword in said
+   header when compiled with Borland C++ 6 */
+#if defined(__BORLANDC__) && !defined(__cplusplus)
+#define inline __inline
+#define _inline __inline
+#endif
+
+#include <ws2tcpip.h>
+
+/* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */
+#if defined(GetAddrInfo)
+#include <wspiapi.h>
+#ifndef SUPPORT_IP6
+  #define SUPPORT_IP6
+#endif
+#endif
+
+#ifndef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#endif
+#ifndef EINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+#ifndef EINTR
+#define EINTR WSAEINTR
+#endif
+#ifndef ESHUTDOWN
+#define ESHUTDOWN WSAESHUTDOWN
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#endif
+
+#endif /* __XML_WSOCKCOMPAT_H__ */

local-test-libxml2-delta-01/afc-libxml2/m4/ax_append_flag.m4

@@ -0,0 +1,50 @@
+# ===========================================================================
+#      https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 8
+
+AC_DEFUN([AX_APPEND_FLAG],
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG

local-test-libxml2-delta-01/afc-libxml2/m4/ax_append_link_flags.m4

@@ -0,0 +1,44 @@
+# ===========================================================================
+#   https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   For every FLAG1, FLAG2 it is checked whether the linker works with the
+#   flag.  If it does, the flag is added FLAGS-VARIABLE
+#
+#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
+#   used. During the check the flag is always added to the linker's flags.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
+#   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 7
+
+AC_DEFUN([AX_APPEND_LINK_FLAGS],
+[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
+done
+])dnl AX_APPEND_LINK_FLAGS

local-test-libxml2-delta-01/afc-libxml2/m4/ax_check_link_flag.m4

@@ -0,0 +1,53 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the linker or gives an error.
+#   (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_LINK_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_LINK_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $4 $1"
+  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  LDFLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_LINK_FLAGS