[ros-diffs] [mf] 13664: update to Expat 2.0 pre-release

update to Expat 2.0 pre-release
Modified: trunk/reactos/lib/expat/Changes
Modified: trunk/reactos/lib/expat/MANIFEST
Modified: trunk/reactos/lib/expat/Makefile
Modified: trunk/reactos/lib/expat/Makefile.in
Modified: trunk/reactos/lib/expat/README
Modified: trunk/reactos/lib/expat/configure.in
Modified: trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4
Modified: trunk/reactos/lib/expat/conftools/mkinstalldirs
Modified: trunk/reactos/lib/expat/doc/reference.html
Modified: trunk/reactos/lib/expat/doc/style.css
Modified: trunk/reactos/lib/expat/examples/elements.c
Modified: trunk/reactos/lib/expat/examples/elements.dsp
Added: trunk/reactos/lib/expat/examples/elements.vcproj
Modified: trunk/reactos/lib/expat/examples/outline.dsp
Added: trunk/reactos/lib/expat/examples/outline.vcproj
Added: trunk/reactos/lib/expat/examples/poem.xml
Modified: trunk/reactos/lib/expat/expat.dsw
Modified: trunk/reactos/lib/expat/expat.spec
Modified: trunk/reactos/lib/expat/gennmtab/gennmtab.dsp
Modified: trunk/reactos/lib/expat/lib/expat.dsp
Modified: trunk/reactos/lib/expat/lib/expat.h
Added: trunk/reactos/lib/expat/lib/expat_external.h
Modified: trunk/reactos/lib/expat/lib/expat_static.dsp
Modified: trunk/reactos/lib/expat/lib/expatw.dsp
Modified: trunk/reactos/lib/expat/lib/expatw_static.dsp
Modified: trunk/reactos/lib/expat/lib/internal.h
Modified: trunk/reactos/lib/expat/lib/libexpat.def
Modified: trunk/reactos/lib/expat/lib/libexpatw.def
Modified: trunk/reactos/lib/expat/lib/winconfig.h
Modified: trunk/reactos/lib/expat/lib/xmlparse.c
Modified: trunk/reactos/lib/expat/lib/xmlrole.c
Modified: trunk/reactos/lib/expat/lib/xmltok.c
Modified: trunk/reactos/lib/expat/lib/xmltok.h
Modified: trunk/reactos/lib/expat/lib/xmltok_ns.c
Modified: trunk/reactos/lib/expat/make-release.sh
Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.dsp
Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.dsw
Modified: trunk/reactos/lib/expat/tests/chardata.c
Modified: trunk/reactos/lib/expat/tests/chardata.h
Added: trunk/reactos/lib/expat/tests/minicheck.c
Added: trunk/reactos/lib/expat/tests/minicheck.h
Modified: trunk/reactos/lib/expat/tests/runtests.c
Added: trunk/reactos/lib/expat/tests/runtestspp.cpp
Modified: trunk/reactos/lib/expat/tests/xmltest.sh
Modified: trunk/reactos/lib/expat/win32/README.txt
Modified: trunk/reactos/lib/expat/win32/expat.iss
Modified: trunk/reactos/lib/expat/xmlwf/readfilemap.c
Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.c
Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.c
Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.dsp
Added: trunk/reactos/lib/expat/xmlwf/xmlwf.vcproj
Property changes on: trunk/reactos/lib/expat/COPYING
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/Changes
--- trunk/reactos/lib/expat/Changes	2005-02-20 02:32:23 UTC (rev
13663)
+++ trunk/reactos/lib/expat/Changes	2005-02-20 10:12:49 UTC (rev
13664)
@@ -1,3 +1,20 @@

+Release 1.95.9 TBD
+        - We no longer use the "check" library for C unit testing; we
+          always use the (partial) internal implementation of the API.
+        - Report XML_NS setting via XML_GetFeatureList().
+        - Fixed headers for use from C++.
+        - Updated to use libtool 1.5.10 (the most recent).
+
+Release 1.95.8 Fri Jul 23 2004
+        - Major new feature: suspend/resume.  Handlers can now request
+          that a parse be suspended for later resumption or aborted
+          altogether.  See "Temporarily Stopping Parsing" in the
+          documentation for more details.
+        - Some mostly minor bug fixes, but compilation should no
+          longer generate warnings on most platforms.  SF issues
+          include: 827319, 840173, 846309, 888329, 896188, 923913,
+          928113, 961698, 985192.
+
 Release 1.95.7 Mon Oct 20 2003
         - Fixed enum XML_Status issue (reported on SourceForge many
           times), so compilers that are properly picky will be happy.
Property changes on: trunk/reactos/lib/expat/Changes
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/MANIFEST
--- trunk/reactos/lib/expat/MANIFEST	2005-02-20 02:32:23 UTC (rev
13663)
+++ trunk/reactos/lib/expat/MANIFEST	2005-02-20 10:12:49 UTC (rev
13664)
@@ -1,13 +1,5 @@

-Changes
-COPYING
-MANIFEST
-Makefile.in
-README
-configure
-configure.in
-expat_config.h.in
-expat.dsw
 bcb5/README.txt
+bcb5/all_projects.bpg
 bcb5/elements.bpf
 bcb5/elements.bpr
 bcb5/elements.mak
@@ -33,37 +25,53 @@
 bcb5/xmlwf.bpf
 bcb5/xmlwf.bpr
 bcb5/xmlwf.mak
+doc/expat.png
+doc/reference.html
+doc/style.css
+doc/valid-xhtml10.png
+doc/xmlwf.1
+doc/xmlwf.sgml
+COPYING
+Changes
+MANIFEST
+Makefile.in
+README
+configure
+configure.in
+expat_config.h.in
+expat.dsw
 conftools/PrintPath
 conftools/ac_c_bigendian_cross.m4
 conftools/config.guess
 conftools/config.sub
 conftools/expat.m4
+conftools/get-version.sh
 conftools/install-sh
 conftools/libtool.m4
 conftools/ltmain.sh
 conftools/mkinstalldirs
-doc/reference.html
-doc/style.css
-doc/valid-xhtml10.png
-doc/xmlwf.1
-doc/xmlwf.sgml
 examples/elements.c
 examples/elements.dsp
 examples/outline.c
 examples/outline.dsp
+lib/Makefile.MPW
 lib/ascii.h
 lib/asciitab.h
 lib/expat.dsp
 lib/expat.h
+lib/expat_external.h
+lib/expat_static.dsp
 lib/expatw.dsp
-lib/expat_static.dsp
 lib/expatw_static.dsp
 lib/iasciitab.h
 lib/internal.h
 lib/latin1tab.h
+lib/libexpat.def
 lib/libexpatw.def
+lib/macconfig.h
 lib/nametab.h
 lib/utf8tab.h
+lib/winconfig.h
 lib/xmlparse.c
 lib/xmlrole.c
 lib/xmlrole.h
@@ -72,17 +80,24 @@
 lib/xmltok_impl.c
 lib/xmltok_impl.h
 lib/xmltok_ns.c
-lib/winconfig.h
+tests/benchmark/README.txt
+tests/benchmark/benchmark.c
+tests/benchmark/benchmark.dsp
+tests/benchmark/benchmark.dsw
 tests/README.txt
 tests/chardata.c
 tests/chardata.h
+tests/minicheck.c
+tests/minicheck.h
 tests/runtests.c
+tests/runtestspp.cpp
 tests/xmltest.sh
+vms/README.vms
 vms/descrip.mms
 vms/expat_config.h
-vms/README.vms
+win32/MANIFEST.txt
+win32/README.txt
 win32/expat.iss
-win32/MANIFEST.txt
 xmlwf/codepage.c
 xmlwf/codepage.h
 xmlwf/ct.c
Property changes on: trunk/reactos/lib/expat/MANIFEST
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/Makefile
--- trunk/reactos/lib/expat/Makefile	2005-02-20 02:32:23 UTC (rev
13663)
+++ trunk/reactos/lib/expat/Makefile	2005-02-20 10:12:49 UTC (rev
13664)
@@ -1,4 +1,4 @@

-# $Id$
+# $Id: Makefile 13593 2005-02-16 14:01:34Z weiden $
 
 PATH_TO_TOP = ../..
 
Property changes on: trunk/reactos/lib/expat/Makefile
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/Makefile.in
--- trunk/reactos/lib/expat/Makefile.in	2005-02-20 02:32:23 UTC (rev
13663)
+++ trunk/reactos/lib/expat/Makefile.in	2005-02-20 10:12:49 UTC (rev
13664)
@@ -41,9 +41,12 @@

 mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
 MANFILE = $(srcdir)/doc/xmlwf.1
-APIHEADER = $(srcdir)/lib/expat.h
+APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
 LIBRARY = libexpat.la
 
+ifndef INSTALL_ROOT
+INSTALL_ROOT=$(DESTDIR)
+endif
 
 default:  buildlib xmlwf/xmlwf
 
@@ -55,7 +58,8 @@
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
 	cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
 	cd examples && rm -f elements outline *.o *.lo && rm -rf .libs
_libs
-	cd tests && rm -rf .libs runtests runtests.o chardata.o
+	cd tests && rm -rf .libs runtests runtests.o runtestspp
runtestspp.o
+	cd tests && rm -f chardata.o minicheck.o
 	rm -rf .libs libexpat.la
 	rm -f examples/core tests/core xmlwf/core
 
@@ -69,26 +73,28 @@
 	rm -f expat_config.h.in configure
 	rm -f conftools/ltconfig conftools/ltmain.sh
conftools/libtool.m4
 
-check: tests/runtests
+check: tests/runtests tests/runtestspp
 	tests/runtests
+	tests/runtestspp
 
 install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(bindir) $(man1dir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf
$(bindir)/xmlwf
-	$(INSTALL_DATA) $(MANFILE) $(man1dir)
+	$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL_ROOT)$(man1dir)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf
$(INSTALL_ROOT)$(bindir)/xmlwf
+	$(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir)
 
 installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY)
$(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) $(APIHEADER) $(includedir)
+	$(mkinstalldirs) $(INSTALL_ROOT)$(libdir)
$(INSTALL_ROOT)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY)
$(INSTALL_ROOT)$(libdir)/$(LIBRARY)
+	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN
$(INSTALL_ROOT)$(includedir) ; done
 
 uninstall: uninstalllib
-	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-	rm -f $(man1dir)/xmlwf.1
+	$(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf
+	rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1
 
 uninstalllib:
-	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
-	rm -f $(includedir)/$(APIHEADER)
+	$(LIBTOOL) --mode=uninstall rm -f
$(INSTALL_ROOT)$(libdir)/$(LIBRARY)
+	rm -f $(INSTALL_ROOT)$(includedir)/expat.h
+	rm -f $(INSTALL_ROOT)$(includedir)/expat_external.h
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
@@ -108,25 +114,27 @@
 ### autoconf this?
 LTFLAGS = --silent
 
-COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined
$(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o
$@
+LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE)
$(LDFLAGS) -o $@
 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
 
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h
\
-	$(top_builddir)/expat_config.h lib/internal.h
+	$(top_builddir)/expat_config.h lib/expat_external.h
lib/internal.h
 
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
-	$(top_builddir)/expat_config.h lib/internal.h
+	$(top_builddir)/expat_config.h lib/expat_external.h
lib/internal.h
 
 lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
 	lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
 	lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
-	$(top_builddir)/expat_config.h
+	$(top_builddir)/expat_config.h lib/expat_external.h
lib/internal.h
 
 
 XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o
xmlwf/@FILEMAP@.o
@@ -146,9 +154,13 @@
 	$(LINK_EXE) $< $(LIBRARY)
 
 tests/chardata.o: tests/chardata.c tests/chardata.h
+tests/minicheck.o: tests/minicheck.c tests/minicheck.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY)
-	$(LINK_EXE) $^ -lcheck
+tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o
$(LIBRARY)
+	$(LINK_EXE) $^
+tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c
tests/chardata.h
+tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o
$(LIBRARY)
+	$(LINK_CXX_EXE) $^
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \
Property changes on: trunk/reactos/lib/expat/Makefile.in
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/README
--- trunk/reactos/lib/expat/README	2005-02-20 02:32:23 UTC (rev
13663)
+++ trunk/reactos/lib/expat/README	2005-02-20 10:12:49 UTC (rev
13664)
@@ -1,5 +1,5 @@

 
-                        Expat, Release 1.95.7
+                        Expat, Release 1.95.8
 
 This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register
@@ -92,13 +92,6 @@
 
         PATH=/usr/ccs/bin:$PATH make
 
-The unit and regression tests for Expat require the "check" library on
-Unix; more information is available at http://check.sourceforge.net/,
-and downloadable packages are available from the library's project
-page on SourceForge: http://sourceforge.net/projects/check/.  You do
-not need to install the check library to build and use Expat, only to
-build and run Expat's test suite.
-
 When using Expat with a project using autoconf for configuration, you
 can use the probing macro in conftools/expat.m4 to determine how to
 include Expat.  See the comments at the top of that file for more
@@ -116,4 +109,4 @@
 place on expat-discuss(a)mail.libexpat.org.  Archives of this list and
 other Expat-related lists may be found at:
 
-        http://mail.libexpat.org/mailman-21/listinfo/
+        http://mail.libexpat.org/mailman/listinfo/
Property changes on: trunk/reactos/lib/expat/README
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/README.txt
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/all_projects.bpg
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/elements.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/elements.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/elements.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/libexpat_mtd.def
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/libexpatw_mtd.def
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/makefile.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/outline.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/outline.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/outline.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/setup.bat
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.bpf
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.bpr
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.mak
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/buildconf.sh
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/configure.in
--- trunk/reactos/lib/expat/configure.in	2005-02-20 02:32:23 UTC
(rev 13663)
+++ trunk/reactos/lib/expat/configure.in	2005-02-20 10:12:49 UTC
(rev 13664)
@@ -103,9 +103,38 @@

 fi
 AC_SUBST(FILEMAP)
 
-dnl Only needed for regression tests:
-AC_CHECK_HEADERS(check.h)
+dnl Needed for the test support code; this was found at
+dnl
http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
 
+# AC_CPP_FUNC
+# ------------------ #
+# Checks to see if ANSI C99 CPP variable __func__ works.
+# If not, perhaps __FUNCTION__ works instead. 
+# If not, we'll just define __func__ to "". 
+AC_DEFUN([AC_CPP_FUNC],
+[AC_REQUIRE([AC_PROG_CC_STDC])dnl
+AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __func__;]])],
+  [ac_cv_cpp_func=yes], 
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __FUNCTION__;]])],
+  [ac_cv_cpp_func=__FUNCTION__], 
+  [ac_cv_cpp_func=no])])])
+if test $ac_cv_cpp_func = __FUNCTION__; then
+  AC_DEFINE(__func__,__FUNCTION__,
+            [Define to __FUNCTION__ or "" if `__func__' does not
conform to 
+ANSI C.])
+elif test $ac_cv_cpp_func = no; then
+  AC_DEFINE(__func__,"",
+            [Define to __FUNCTION__ or "" if `__func__' does not
conform to 
+ANSI C.])
+fi
+])# AC_CPP_FUNC
+
+AC_CPP_FUNC
+
+
 dnl Some basic configuration:
 AC_DEFINE([XML_NS], 1,
           [Define to make XML Namespaces functionality available.])
Property changes on: trunk/reactos/lib/expat/configure.in
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/PrintPath
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4
--- trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4
2005-02-20 02:32:23 UTC (rev 13663)
+++ trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4
2005-02-20 10:12:49 UTC (rev 13664)
@@ -7,7 +7,7 @@

 dnl the binary it will be grep'ed for some symbols that will look
 dnl different for different endianess of the binary.
 dnl
-dnl @version $Id$
+dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2001/10/01 20:03:13
fdrake Exp $
 dnl @author Guido Draheim &lt;guidod(a)gmx.de&gt;
 dnl
 AC_DEFUN([AC_C_BIGENDIAN_CROSS],
Property changes on:
trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/config.guess
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/config.sub
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/expat.m4
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/get-version.sh
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/conftools/install-sh
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/conftools/mkinstalldirs
--- trunk/reactos/lib/expat/conftools/mkinstalldirs	2005-02-20
02:32:23 UTC (rev 13663)
+++ trunk/reactos/lib/expat/conftools/mkinstalldirs	2005-02-20
10:12:49 UTC (rev 13664)
@@ -4,7 +4,7 @@

 # Created: 1993-05-16
 # Public domain
 
-# $Id$
+# $Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp $
 
 errstatus=0
 
Property changes on: trunk/reactos/lib/expat/conftools/mkinstalldirs
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/doc/reference.html
--- trunk/reactos/lib/expat/doc/reference.html	2005-02-20 02:32:23 UTC
(rev 13663)
+++ trunk/reactos/lib/expat/doc/reference.html	2005-02-20 10:12:49 UTC
(rev 13664)
@@ -19,7 +19,7 @@

       <td class="banner"><h1>The Expat XML
Parser</h1></td>
     </tr>
     <tr>
-      <td class="releaseno">Release 1.95.7</td>
+      <td class="releaseno">Release 1.95.8</td>
       <td></td>
     </tr>
   </table>
@@ -72,6 +72,9 @@
       <li><a href="#XML_Parse">XML_Parse</a></li>
       <li><a
href="#XML_ParseBuffer">XML_ParseBuffer</a></li>
       <li><a
href="#XML_GetBuffer">XML_GetBuffer</a></li>
+      <li><a
href="#XML_StopParser">XML_StopParser</a></li>
+      <li><a
href="#XML_ResumeParser">XML_ResumeParser</a></li>
+      <li><a
href="#XML_GetParsingStatus">XML_GetParsingStatus</a></li>
     </ul>
     </li>
     <li><a href="#setting">Handler Setting Functions</a>
@@ -317,12 +320,12 @@
 <dl class="cpp-symbols">
 <dt>XML_DTD</dt>
 <dd>Include support for using and reporting DTD-based content.  If
-this is defined, default attribute values from the DTD are reported
-and attribute value normalization occurs based on the type of
-attributes.  Callbacks can be registered which report information from
-the DTD (including content models and attribute definitions) only if
-this is defined.  Without this, Expat has a smaller memory footprint
-and can be faster.</dd>
+this is defined, default attribute values from an external DTD subset
+are reported and attribute value normalization occurs based on the
+type of attributes defined in the external subset.  Without
+this, Expat has a smaller memory footprint and can be faster, but will
+not load external entities or process conditional sections.  This does
+not affect the set of functions available in the API.</dd>
 
 <dt>XML_NS</dt>
 <dd>When defined, support for the <cite><a href=
@@ -345,10 +348,11 @@
 <dd>The number of input bytes of markup context which the parser will
 ensure are available for reporting via <code><a href=
 "#XML_GetInputContext" >XML_GetInputContext</a></code>.  This
is
-normally set to 1024.  If this is not defined, the input context will
-not be available and <code><a href= "#XML_GetInputContext"
->XML_GetInputContext</a></code> will always report NULL.  Without
-this, Expat has a smaller memory footprint and can be faster.</dd>
+normally set to 1024, and must be set to a positive interger.  If this
+is not defined, the input context will not be available and <code><a
+href= "#XML_GetInputContext" >XML_GetInputContext</a></code>
will
+always report NULL.  Without this, Expat has a smaller memory
+footprint and can be faster.</dd>
 
 <dt>XML_STATIC</dt>
 <dd>On Windows, this should be set if Expat is going to be linked
@@ -415,7 +419,7 @@
 void *) to data with further internal structure. In order to free the
 memory associated with this object you must call <code><a href=
 "#XML_ParserFree" >XML_ParserFree</a></code>. Note that if you
have
-provided any <a href="userdata">user data</a> that gets stored in
the
+provided any <a href="#userdata">user data</a> that gets stored in
the
 parser, then your application is responsible for freeing it prior to
 calling <code>XML_ParserFree</code>.</p>
 
@@ -509,7 +513,7 @@
 data is passed; it will have the type <code>XML_Parser</code> if the
 parser itself is passed.  When the parser is passed, the user data may
 be retrieved using <code><a href="#XML_GetUserData"
->XML_GetUserData</code></a>.</p>
+>XML_GetUserData</a></code>.</p>
 
 <p>One common case where multiple calls to a single handler may need
 to communicate using an application data structure is the case when
@@ -587,12 +591,12 @@
 separator character (which is the 2nd argument to <code><a href=
 "#XML_ParserCreateNS" >XML_ParserCreateNS</a></code>), and the
local
 name (i.e. the part after the colon). Names with undeclared prefixes
-are passed through to the handlers unchanged, with the prefix and
-colon still attached. Unprefixed attribute names are never expanded,
+are not well-formed when namespace processing is enabled, and will
+trigger an error. Unprefixed attribute names are never expanded,
 and unprefixed element names are only expanded when they are in the
 scope of a default namespace.</p>
 
-<p>However if <code><a href= "XML_SetReturnNSTriplet"
+<p>However if <code><a href= "#XML_SetReturnNSTriplet"
>  XML_SetReturnNSTriplet</a></code> has been
> called with a non-zero 
 <code>do_nst</code> parameter, then the expanded
form for names with
 an explicit prefix is a concatenation of: URI, separator, local name,
@@ -602,7 +606,7 @@
 for the end of a scope of a declaration with the <code><a href=
 "#XML_SetNamespaceDeclHandler"
>XML_SetNamespaceDeclHandler</a></code>
 function.  The StartNamespaceDeclHandler is called prior to the start
-tag handler and the EndNamespaceDeclHandler is called before the
+tag handler and the EndNamespaceDeclHandler is called after the
 corresponding end tag that ends the namespace's scope.  The namespace
 start handler gets passed the prefix and URI for the namespace.  For a
 default namespace declaration (xmlns='...'), the prefix will be null.
@@ -727,6 +731,149 @@
 <p>In order to read an external DTD, you also have to set an external
 entity reference handler as described above.</p>
 
+<h3 id="stop-resume">Temporarily Stopping Parsing</h3>
+
+<p>Expat 1.95.8 introduces a new feature: its now possible to stop
+parsing temporarily from within a handler function, even if more data
+has already been passed into the parser.  Applications for this
+include</p>
+
+<ul>
+  <li>Supporting the <a href= "http://www.w3.org/TR/xinclude/"
+  >XInclude</a> specification.</li>
+
+  <li>Delaying further processing until additional information is
+  available from some other source.</li>
+
+  <li>Adjusting processor load as task priorities shift within an
+  application.</li>
+
+  <li>Stopping parsing completely (simply free or reset the parser
+  instead of resuming in the outer parsing loop).  This can be useful
+  if a application-domain error is found in the XML being parsed or if
+  the result of the parse is determined not to be useful after
+  all.</li>
+</ul>
+
+<p>To take advantage of this feature, the main parsing loop of an
+application needs to support this specifically.  It cannot be
+supported with a parsing loop compatible with Expat 1.95.7 or
+earlier (though existing loops will continue to work without
+supporting the stop/resume feature).</p>
+
+<p>An application that uses this feature for a single parser will have
+the rough structure (in pseudo-code):</p>
+
+<pre class="pseudocode">
+fd = open_input()
+p = create_parser()
+
+if parse_xml(p, fd) {
+  /* suspended */
+
+  int suspended = 1;
+
+  while (suspended) {
+    do_something_else()
+    if ready_to_resume() {
+      suspended = continue_parsing(p, fd);
+    }
+  }
+}
+</pre>
+
+<p>An application that may resume any of several parsers based on
+input (either from the XML being parsed or some other source) will
+certainly have more interesting control structures.</p>
+
+<p>This C function could be used for the <code>parse_xml</code>
+function mentioned in the pseudo-code above:</p>
+
+<pre class="eg">
+#define BUFF_SIZE 10240
+
+/* Parse a document from the open file descriptor 'fd' until the parse
+   is complete (the document has been completely parsed, or there's
+   been an error), or the parse is stopped.  Return non-zero when
+   the parse is merely suspended.
+*/
+int
+parse_xml(XML_Parser p, int fd)
+{
+  for (;;) {
+    int last_chunk;
+    int bytes_read;
+    enum XML_Status status;
+
+    void *buff = XML_GetBuffer(p, BUFF_SIZE);
+    if (buff == NULL) {
+      /* handle error... */
+      return 0;
+    }
+    bytes_read = read(fd, buff, BUFF_SIZE);
+    if (bytes_read &lt; 0) {
+      /* handle error... */
+      return 0;
+    }
+    status = XML_ParseBuffer(p, bytes_read, bytes_read == 0);
+    switch (status) {
+      case XML_STATUS_ERROR:
+        /* handle error... */
+        return 0;
+      case XML_STATUS_SUSPENDED:
+        return 1;
+    }
+    if (bytes_read == 0)
+      return 0;
+  }
+}
+</pre>
+
+<p>The corresponding <code>continue_parsing</code> function is
+somewhat simpler, since it only need deal with the return code from
+<code><a href=
"#XML_ResumeParser">XML_ResumeParser</a></code>; it can
+delegate the input handling to the <code>parse_xml</code>
+function:</p>
+
+<pre class="eg">
+/* Continue parsing a document which had been suspended.  The 'p' and
+   'fd' arguments are the same as passed to parse_xml().  Return
+   non-zero when the parse is suspended.
+*/
+int
+continue_parsing(XML_Parser p, int fd)
+{
+  enum XML_Status status = XML_ResumeParser(p);
+  switch (status) {
+    case XML_STATUS_ERROR:
+      /* handle error... */
+      return 0;
+    case XML_ERROR_NOT_SUSPENDED:
+      /* handle error... */
+      return 0;.
+    case XML_STATUS_SUSPENDED:
+      return 1;
+  }
+  return parse_xml(p, fd);
+}
+</pre>
+
+<p>Now that we've seen what a mess the top-level parsing loop can
+become, what have we gained?  Very simply, we can now use the <code><a
+href= "#XML_StopParser" >XML_StopParser</a></code> function to
stop
+parsing, without having to go to great lengths to avoid additional
+processing that we're expecting to ignore.  As a bonus, we get to stop
+parsing <em>temporarily</em>, and come back to it when we're
+ready.</p>
+
+<p>To stop parsing from a handler function, use the <code><a href=
+"#XML_StopParser" >XML_StopParser</a></code> function.  This
function
+takes two arguments; the parser being stopped and a flag indicating
+whether the parse can be resumed in the future.</p>
+
+<!-- XXX really need more here -->
+
+
 <hr />
 <!-- ================================================================
-->
 
@@ -761,7 +908,11 @@
 expanded element names and attribute names are returned as a
concatenation
 of the namespace URI, <em>sep</em>, and the local part of the name.
This
 means that you should pick a character for <em>sep</em> that can't be
-part of a legal URI.</div>
+part of a legal URI. There is a special case when <em>sep</em> is the
null
+character <code>'\0'</code>: the namespace URI and the local part
will
be
+concatenated without any separator - this is intended to support RDF
processors.
+It is a programming error to use the null separator with 
+<a href= "#XML_SetReturnNSTriplet">namespace
triplets</a>.</div>
 
 <pre class="fcndec" id="XML_ParserCreate_MM">
 XML_Parser XMLCALL
@@ -818,8 +969,10 @@
 <div class="fcndef">
 Clean up the memory structures maintained by the parser so that it may
 be used again.  After this has been called, <code>parser</code> is
-ready to start parsing a new document.  This function may not be used
-on a parser created using <code><a href=
+ready to start parsing a new document.  All handlers are cleared from
+the parser, except for the unknownEncodingHandler.  The parser's
external
+state is re-initialized except for the values of ns and ns_triplets.
+This function may not be used on a parser created using <code><a href=
 "#XML_ExternalEntityParserCreate" >XML_ExternalEntityParserCreate</a
>  </code>; it will return
> <code>XML_FALSE</code> in that case.  Returns 
<code>XML_TRUE</code> on success.  Your application is responsible for
@@ -915,6 +1068,125 @@
 </pre>
 </div>
 
+<pre class="fcndec" id="XML_StopParser">
+enum XML_Status XMLCALL
+XML_StopParser(XML_Parser p,
+               XML_Bool resumable);
+</pre>
+<div class="fcndef">
+
+<p>Stops parsing, causing <code><a href= "#XML_Parse"
+>XML_Parse</a></code> or <code><a href=
"#XML_ParseBuffer"
+>XML_ParseBuffer</a></code> to return.  Must be called from within a
+call-back handler, except when aborting (when <code>resumable</code>
+is <code>XML_FALSE</code>) an already suspended parser.  Some
+call-backs may still follow because they would otherwise get
+lost, including
+<ul>
+  <li> the end element handler for empty elements when stopped in the
+       start element handler,</li>
+  <li> end namespace declaration handler when stopped in the end
+       element handler,</li>
+</ul>
+and possibly others.</p>
+
+<p>This can be called from most handlers, including DTD related
+call-backs, except when parsing an external parameter entity and
+<code>resumable</code> is <code>XML_TRUE</code>.  Returns
+<code>XML_STATUS_OK</code> when successful,
+<code>XML_STATUS_ERROR</code> otherwise.  The possible error codes
+are:</p>
+<dl>
+  <dt><code>XML_ERROR_SUSPENDED</code></dt>
+  <dd>when suspending an already suspended parser.</dd>
+  <dt><code>XML_ERROR_FINISHED</code></dt>
+  <dd>when the parser has already finished.</dd>
+  <dt><code>XML_ERROR_SUSPEND_PE</code></dt>
+  <dd>when suspending while parsing an external PE.</dd>
+</dl>
+
+<p>Since the stop/resume feature requires application support in the
+outer parsing loop, it is an error to call this function for a parser
+not being handled appropriately; see <a href= "#stop-resume"
+>Temporarily Stopping Parsing</a> for more information.</p>
+
+<p>When <code>resumable</code> is <code>XML_TRUE</code>
then parsing
+is <em>suspended</em>, that is, <code><a href=
"#XML_Parse"
+>XML_Parse</a></code> and <code><a href=
"#XML_ParseBuffer"
+>XML_ParseBuffer</a></code> return
<code>XML_STATUS_SUSPENDED</code>.
+Otherwise, parsing is <em>aborted</em>, that is, <code><a href=
+"#XML_Parse" >XML_Parse</a></code> and <code><a href=
+"#XML_ParseBuffer" >XML_ParseBuffer</a></code> return
+<code>XML_STATUS_ERROR</code> with error code
+<code>XML_ERROR_ABORTED</code>.</p>
+
+<p><strong>Note:</strong>
+This will be applied to the current parser instance only, that is, if
+there is a parent parser then it will continue parsing when the
+external entity reference handler returns.  It is up to the
+implementation of that handler to call <code><a href=
+"#XML_StopParser" >XML_StopParser</a></code> on the parent
parser
+(recursively), if one wants to stop parsing altogether.</p>
+
+<p>When suspended, parsing can be resumed by calling <code><a href=
+"#XML_ResumeParser" >XML_ResumeParser</a></code>.</p>
+
+<p>New in Expat 1.95.8.</p>
+</div>
+
+<pre class="fcndec" id="XML_ResumeParser">
+enum XML_Status XMLCALL
+XML_ResumeParser(XML_Parser p);
+</pre>
+<div class="fcndef">
+<p>Resumes parsing after it has been suspended with <code><a href=
+"#XML_StopParser" >XML_StopParser</a></code>.  Must not be
called from
+within a handler call-back.  Returns same status codes as <code><a
+href= "#XML_Parse">XML_Parse</a></code> or <code><a
href=
+"#XML_ParseBuffer" >XML_ParseBuffer</a></code>.  An additional
error
+code, <code>XML_ERROR_NOT_SUSPENDED</code>, will be returned if the
+parser was not currently suspended.</p>
+
+<p><strong>Note:</strong>
+This must be called on the most deeply nested child parser instance
+first, and on its parent parser only after the child parser has
+finished, to be applied recursively until the document entity's parser
+is restarted.  That is, the parent parser will not resume by itself
+and it is up to the application to call <code><a href=
+"#XML_ResumeParser" >XML_ResumeParser</a></code> on it at the
+appropriate moment.</p>
+
+<p>New in Expat 1.95.8.</p>
+</div>
+
+<pre class="fcndec" id="XML_GetParsingStatus">
+void XMLCALL
+XML_GetParsingStatus(XML_Parser p,
+                     XML_ParsingStatus *status);
+</pre>
+<pre class="signature">
+enum XML_Parsing {
+  XML_INITIALIZED,
+  XML_PARSING,
+  XML_FINISHED,
+  XML_SUSPENDED
+};
+
+typedef struct {
+  enum XML_Parsing parsing;
+  XML_Bool finalBuffer;
+} XML_ParsingStatus;
+</pre>
+<div class="fcndef">
+<p>Returns status of parser with respect to being initialized,
+parsing, finished, or suspended, and whether the final buffer is being
+processed.  The <code>status</code> parameter <em>must not</em>
be
+NULL.</p>
+
+<p>New in Expat 1.95.8.</p>
+</div>
+
+
 <h3><a name="setting">Handler Setting</a></h3>
 
 <p>Although handlers are typically set prior to parsing and left alone,
an
@@ -1252,8 +1524,8 @@
 "#XML_ParseBuffer" >XML_ParseBuffer</a></code> have been called
on the
 given parser.</p> <p>If the handler knows how to deal with an encoding
 with the given name, it should fill in the <code>info</code> data
-structure and return <code>XML_STATUS_ERROR</code>. Otherwise it
-should return <code>XML_STATUS_OK</code>. The handler will be called
+structure and return <code>XML_STATUS_OK</code>. Otherwise it
+should return <code>XML_STATUS_ERROR</code>. The handler will be called
 at most once per parsed (external) entity. The optional application
 data pointer <code>encodingHandlerData</code> will be passed back to
 the handler.</p>
@@ -1685,6 +1957,9 @@
 <p>Only a limited amount of context is kept, so if the event
 triggering a call spans over a very large amount of input, the actual
 parse position may be before the beginning of the buffer.</p>
+
+<p>If <code>XML_CONTEXT_BYTES</code> is not defined, this will always
+return NULL.</p>
 </div>
 
 <h3><a name="miscellaneous">Miscellaneous
functions</a></h3>
@@ -1837,6 +2112,11 @@
 DTD support, it returns
 <code>XML_ERROR_FEATURE_REQUIRES_XML_DTD</code>.  Otherwise, it
 returns <code>XML_ERROR_NONE</code>.</p>
+
+<p><b>Note:</b> For the purpose of checking WFC: Entity Declared,
passing
+<code>useDTD == XML_TRUE</code> will make the parser behave as if
+the document had a DTD with an external subset. This holds true even if
+the external entity reference handler returns without action.</p>
 </div>
 
 <pre class="fcndec" id="XML_SetReturnNSTriplet">
Property changes on: trunk/reactos/lib/expat/doc/reference.html
___________________________________________________________________
Name: svn:keywords
   - author date id revision
  _____  

Modified: trunk/reactos/lib/expat/doc/style.css
--- trunk/reactos/lib/expat/doc/style.css	2005-02-20 02:32:23 UTC
(rev 13663)
+++ trunk/reactos/lib/expat/doc/style.css	2005-02-20 10:12:49 UTC
(rev 13664)
@@ -49,6 +49,17 @@

   margin-right: 10%;
 }
 
+.pseudocode {
+  padding-left: 1em;
+  padding-top: .5em;
+  padding-bottom: .5em;
+  border: solid thin;
+  margin: 1em 0;
+  background-color: rgb(250,220,180);
+  margin-left: 2em;
+  margin-right: 10%;
+}
+
 .handler {
   width: 100%;
   border-top-width: thin;  
Property changes on: trunk/reactos/lib/expat/doc/style.css
___________________________________________________________________
Name: svn:keywords
   - author date id revision
Property changes on: trunk/reactos/lib/expat/doc/xmlwf.1
___________________________________________________________________
[truncated at 1000 lines; 6007 more skipped]