From gstein@users.sourceforge.net Sat Jun 1 16:30:27 2002 From: gstein@users.sourceforge.net (gstein@users.sourceforge.net) Date: Sat Jun 1 15:30:27 2002 Subject: [Expat-checkins] expat Makefile.in,1.33,1.34 buildconf.sh,1.7,1.8 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv23278 Modified Files: Makefile.in buildconf.sh Log Message: Work on fixing bug #462960 * add Apache's version of config.guess and config.sub, which are both recent, and have some helpful mods * buildconf.sh: tweak call to libtoolize to avoid overwriting the above * conftools/.cvsignore: the new files are supposed to be there * Makefile.in: tweak to use $(prefix) for the manual page so that it picks up install-time prefix changes. tossed an old comment. tweak the 'extraclean' rule to avoid tossing the added config.* files. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile.in 31 May 2002 15:51:21 -0000 1.33 +++ Makefile.in 1 Jun 2002 22:29:30 -0000 1.34 @@ -17,16 +17,6 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. # -# --- -# I started using automake, but -# 1) it seemed like overkill -# 2) I don't want all the GNU policies -# 3) I wanted more explicit control over what gets built -# -# So I'm doing my Makefile.in files manually. But a fair part is based -# on what I learned from perusing the Makefile.in's generated by automake, -# and the automake authors still get my kudos. -# SHELL = @SHELL@ @@ -40,7 +30,7 @@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ -mandir = @prefix@/man/man1 +mandir = ${prefix}/man/man1 top_builddir = . @@ -72,7 +62,6 @@ extraclean: distclean rm -f expat_config.h.in configure - rm -f conftools/config.guess conftools/config.sub rm -f conftools/ltconfig conftools/ltmain.sh check: tests/runtests Index: buildconf.sh =================================================================== RCS file: /cvsroot/expat/expat/buildconf.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- buildconf.sh 17 May 2002 21:38:44 -0000 1.7 +++ buildconf.sh 1 Jun 2002 22:29:30 -0000 1.8 @@ -14,13 +14,18 @@ exit 1 fi +# Remove any libtool files so one can switch between libtool 1.3 +# and libtool 1.4 by simply rerunning the buildconf script. +(cd conftools/; rm -f ltmain.sh ltconfig) + +# +# Note: we don't use --force (any more) since we have a special +# config.guess/config.sub that we want to ensure is used. # -# --force to ensure that we replace with current files # --copy to avoid symlinks; we want originals for the distro # --automake to make it shut up about "things to do" # -(cd conftools/; rm -f ltmain.sh ltconfig) -$libtoolize --force --copy --automake +$libtoolize --copy --automake ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 From gstein@users.sourceforge.net Sat Jun 1 16:30:27 2002 From: gstein@users.sourceforge.net (gstein@users.sourceforge.net) Date: Sat Jun 1 15:30:27 2002 Subject: [Expat-checkins] expat/conftools config.guess,1.2,1.3 config.sub,1.2,1.3 .cvsignore,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/conftools In directory usw-pr-cvs1:/tmp/cvs-serv23278/conftools Modified Files: .cvsignore Added Files: config.guess config.sub Log Message: Work on fixing bug #462960 * add Apache's version of config.guess and config.sub, which are both recent, and have some helpful mods * buildconf.sh: tweak call to libtoolize to avoid overwriting the above * conftools/.cvsignore: the new files are supposed to be there * Makefile.in: tweak to use $(prefix) for the manual page so that it picks up install-time prefix changes. tossed an old comment. tweak the 'extraclean' rule to avoid tossing the added config.* files. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/conftools/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 23 Aug 2001 13:27:38 -0000 1.2 +++ .cvsignore 1 Jun 2002 22:29:30 -0000 1.3 @@ -1,5 +1,3 @@ libtool.m4 -config.guess -config.sub ltconfig ltmain.sh From gstein@users.sourceforge.net Sat Jun 1 16:37:19 2002 From: gstein@users.sourceforge.net (gstein@users.sourceforge.net) Date: Sat Jun 1 15:37:19 2002 Subject: [Expat-checkins] expat Makefile.in,1.34,1.35 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv25646 Modified Files: Makefile.in Log Message: conftools/libtool.m4 is generated by buildconf.sh, so make sure that it gets tossed during 'extraclean' Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Makefile.in 1 Jun 2002 22:29:30 -0000 1.34 +++ Makefile.in 1 Jun 2002 22:35:28 -0000 1.35 @@ -62,7 +62,7 @@ extraclean: distclean rm -f expat_config.h.in configure - rm -f conftools/ltconfig conftools/ltmain.sh + rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4 check: tests/runtests tests/runtests From gstein@users.sourceforge.net Sat Jun 1 16:56:10 2002 From: gstein@users.sourceforge.net (gstein@users.sourceforge.net) Date: Sat Jun 1 15:56:10 2002 Subject: [Expat-checkins] expat buildconf.sh,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv29516 Modified Files: buildconf.sh Log Message: Add real checks for autoconf 2.52 and libtool 1.4 so that we can produce "nice" errors if they are not present. Index: buildconf.sh =================================================================== RCS file: /cvsroot/expat/expat/buildconf.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- buildconf.sh 1 Jun 2002 22:29:30 -0000 1.8 +++ buildconf.sh 1 Jun 2002 22:55:22 -0000 1.9 @@ -1,24 +1,63 @@ #! /bin/sh +#-------------------------------------------------------------------------- +# autoconf 2.52 or newer # -# Create the libtool helper files +ac_version="`${AUTOCONF:-autoconf} --version 2> /dev/null | head -1 | sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`" +if test -z "$ac_version"; then + echo "ERROR: autoconf not found." + echo " You need autoconf version 2.52 or newer installed." + exit 1 +fi +IFS=.; set $ac_version; IFS=' ' +if test "$1" = "2" -a "$2" -lt "52" || test "$1" -lt "2"; then + echo "ERROR: autoconf version $ac_version found." + echo " You need autoconf version 2.52 or newer installed." + exit 1 +fi + +echo "found: autoconf version $ac_version (ok)" + +#-------------------------------------------------------------------------- +# libtool 1.4 or newer # -echo "Copying libtool helper files ..." # # find libtoolize, or glibtoolize on MacOS X # libtoolize=`conftools/PrintPath glibtoolize libtoolize` if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 + echo "ERROR: libtoolize not found." + echo " You need libtool version 1.4 or newer installed" + exit 1 +fi + +lt_pversion="`$libtoolize --version 2> /dev/null | sed -e 's/^[^0-9]*//'`" + +# convert something like 1.4p1 to 1.4.p1 +lt_version="`echo $lt_pversion | sed -e 's/\([a-z]*\)$/.\1/'`" + +IFS=.; set $lt_version; IFS=' ' +if test "$1" = "1" -a "$2" -lt "4"; then + echo "ERROR: libtool version $lt_pversion found." + echo " You need libtool version 1.4 or newer installed" + exit 1 fi +echo "found: libtool version $lt_pversion (ok)" + +#-------------------------------------------------------------------------- + # Remove any libtool files so one can switch between libtool 1.3 # and libtool 1.4 by simply rerunning the buildconf script. (cd conftools/; rm -f ltmain.sh ltconfig) # +# Create the libtool helper files +# +echo "Copying libtool helper files ..." + +# # Note: we don't use --force (any more) since we have a special # config.guess/config.sub that we want to ensure is used. # @@ -30,6 +69,8 @@ ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 cp $ltfile conftools/libtool.m4 + +#-------------------------------------------------------------------------- ### for a little while... remove stray aclocal.m4 files from ### developers' working copies. we no longer use it. (nothing else From fdrake@users.sourceforge.net Mon Jun 3 12:17:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 11:17:02 2002 Subject: [Expat-checkins] expat Makefile.in,1.35,1.36 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv23617 Modified Files: Makefile.in Log Message: Split the install and uninstall targets into library and non-library components, creating the new targets installlib and uninstalllib. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile.in 1 Jun 2002 22:35:28 -0000 1.35 +++ Makefile.in 3 Jun 2002 18:16:07 -0000 1.36 @@ -67,18 +67,23 @@ check: tests/runtests tests/runtests -install: xmlwf/xmlwf lib/$(LIBRARY) lib/$(APIHEADER) - $(mkinstalldirs) $(bindir) $(libdir) $(includedir) $(mandir) +install: xmlwf/xmlwf installlib + $(mkinstalldirs) $(bindir) $(mandir) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf + $(INSTALL_DATA) doc/xmlwf.1 $(mandir) + +installlib: lib/$(LIBRARY) lib/$(APIHEADER) + $(mkinstalldirs) $(libdir) $(includedir) $(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY) $(INSTALL_DATA) lib/$(APIHEADER) $(includedir) - $(INSTALL_DATA) doc/xmlwf.1 $(mandir) -uninstall: +uninstall: uninstalllib $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf + rm -f $(mandir)/xmlwf.1 + +uninstalllib: $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) rm -f $(includedir)/$(APIHEADER) - rm -f $(mandir)/xmlwf.1 # for VPATH builds (invoked by configure) mkdir-init: From fdrake@users.sourceforge.net Mon Jun 3 12:47:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 11:47:03 2002 Subject: [Expat-checkins] expat README,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv1317 Modified Files: README Log Message: Add Karl's instructions for building the UTF-16 version on Unix. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- README 31 May 2002 04:00:59 -0000 1.14 +++ README 3 Jun 2002 18:46:36 -0000 1.15 @@ -43,6 +43,35 @@ location. Note that you need to have write permission into the directories into which things will be installed. +If you are interested in building Expat to provide document +information in UTF-16 rather than the default UTF-8, following these +instructions: + + 1. For UTF-16 output as unsigned short (and version/error + strings as char), run: + + ./configure CPPFLAGS=-DXML_UNICODE + + For UTF-16 output as wchar_t (incl. version/error strings), + run: + + ./configure CFLAGS="-g -O2 -fshort-wchar" \ + PPFLAGS=-DXML_UNICODE_WCHAR_T + + 2. Edit the MakeFile, changing: + + LIBRARY = libexpat.la + + to: + + LIBRARY = libexpatw.la + + (Note the additional "w" in the library name.) + + 3. Run "make buildlib" (which builds the library only). + + 4. Run "make installlib" (which installs the library only). + Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to add this to your path for the "make" command, and probably also switch From fdrake@users.sourceforge.net Mon Jun 3 13:39:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 12:39:01 2002 Subject: [Expat-checkins] expat expat.spec,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv17413 Modified Files: expat.spec Log Message: Be more specific with a couple of the files that we install. I'm still not sure where the manpage gets compressed, but it certainly does; leaving off the .gz causes the RPM build to not find the file. Index: expat.spec =================================================================== RCS file: /cvsroot/expat/expat/expat.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- expat.spec 17 May 2002 14:15:38 -0000 1.5 +++ expat.spec 3 Jun 2002 19:38:13 -0000 1.6 @@ -34,8 +34,8 @@ %doc COPYING Changes MANIFEST README doc/reference.html doc/style.css /usr/bin/xmlwf /usr/lib -/usr/include -/usr/man/man1/xmlwf.1 +/usr/include/expat.h +/usr/man/man1/xmlwf.1.gz %changelog * Fri May 17 2002 Fred L. Drake, Jr. From fdrake@users.sourceforge.net Mon Jun 3 13:57:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 12:57:04 2002 Subject: [Expat-checkins] htdocs index.html,1.17,1.18 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv22855 Modified Files: index.html Log Message: Fix link to the GOBO-Eiffel project, added a missing word in the description. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- index.html 31 May 2002 16:33:53 -0000 1.17 +++ index.html 3 Jun 2002 19:56:29 -0000 1.18 @@ -79,11 +79,11 @@ C++ interface to Expat (old; not updated since Expat 1.2)
  • - The GOBO project - is working on an Eiffel binding for Expat. Development appears to - have slowed, and there isn't any status information about the Expat - bindings on the website. (I had to dig around the CVS to find any - of the XML support.) + The GOBO + project is working on an Eiffel binding for Expat. Development + appears to have slowed, and there isn't any status information about + the Expat bindings on the website. (I had to dig around the CVS to + find any hint of the XML support.)
  • The TclXML project includes a ; from fdrake@users.sourceforge.net on Mon, Jun 03, 2002 at 11:46:39AM -0700 References: Message-ID: <20020603153015.B2550@lyra.org> On Mon, Jun 03, 2002 at 11:46:39AM -0700, fdrake@users.sourceforge.net wrote: >... > +++ README 3 Jun 2002 18:46:36 -0000 1.15 >... > + For UTF-16 output as wchar_t (incl. version/error strings), > + run: > + > + ./configure CFLAGS="-g -O2 -fshort-wchar" \ > + PPFLAGS=-DXML_UNICODE_WCHAR_T Shouldn't that last line be CPPFLAGS=... ? Cheers, -g -- Greg Stein, http://www.lyra.org/ From fdrake@users.sourceforge.net Mon Jun 3 22:53:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 21:53:02 2002 Subject: [Expat-checkins] htdocs index.html,1.18,1.19 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv612 Modified Files: index.html Log Message: Add news item about the 1.95.3 release. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- index.html 3 Jun 2002 19:56:29 -0000 1.18 +++ index.html 4 Jun 2002 04:52:09 -0000 1.19 @@ -44,6 +44,29 @@ community to participate on the mailing lists to help shape the future of Expat.

    +

    News

    + +
    +
    3 June 2002
    + Expat 1.95.3 released.
    +
    +
      +
    • Added a project to the MSVC workspace to create a wchar_t + version of the library; the DLLs are named libexpatw.dll.
      • +
    • Changed the name of the Windows DLLs from expat.dll to + libexpat.dll; this fixes SF bug #432456.
      • +
    • Added the XML_ParserReset() API function.
      • +
    • Fixed XML_SetReturnNSTriplet() to work for element names.
      • +
    • Made the XML_UNICODE builds usable (thanks, Karl!).
      • +
    • Allow xmlwf to read from standard input.
      • +
    • Install a man page for xmlwf on Unix systems.
      • +
    • Fixed many bugs; see SF bug reports 231864, 461380, 464837, + 466885, 469226, 477667, 484419, 487840, 494749, 496505, + 547350. Other bugs which we can't test as easily may also + have been fixed, especially in the area of build support.
      • +
    +
    +

    References

    If you know of any additional articles or resources which should be From fdrake@users.sourceforge.net Mon Jun 3 23:13:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jun 3 22:13:02 2002 Subject: [Expat-checkins] htdocs index.html,1.19,1.20 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv5588 Modified Files: index.html Log Message: Elaborated on the news description a little. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- index.html 4 Jun 2002 04:52:09 -0000 1.19 +++ index.html 4 Jun 2002 05:12:42 -0000 1.20 @@ -51,12 +51,21 @@ Expat 1.95.3 released.

    This project aims to maintain Expat for both current and future From fdrake@users.sourceforge.net Tue Jun 4 21:57:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 20:57:01 2002 Subject: [Expat-checkins] htdocs/dev trackers.html,NONE,1.1 index.html,1.1,1.2 relreqs-1-95-4.html,1.1,1.2 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv876 Modified Files: index.html relreqs-1-95-4.html Added Files: trackers.html Log Message: Fix style buglet. --- NEW FILE: trackers.html --- Development of Expat

    This area contains information for the developers and maintainers of Expat.

    SourceForge Logo
    Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html 5 Jun 2002 03:49:50 -0000 1.1 +++ index.html 5 Jun 2002 03:56:04 -0000 1.2 @@ -6,7 +6,8 @@ - + Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- relreqs-1-95-4.html 5 Jun 2002 03:49:50 -0000 1.1 +++ relreqs-1-95-4.html 5 Jun 2002 03:56:04 -0000 1.2 @@ -6,7 +6,8 @@
    - + From fdrake@users.sourceforge.net Tue Jun 4 22:02:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:02:01 2002 Subject: [Expat-checkins] htdocs/dev trackers.html,1.1,1.2 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv2118 Modified Files: trackers.html Log Message: Oops, this was not ready for checkin. Index: trackers.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/trackers.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- trackers.html 5 Jun 2002 03:56:04 -0000 1.1 +++ trackers.html 5 Jun 2002 04:01:10 -0000 1.2 @@ -1,6 +1,6 @@ - Development of Expat + SourceForge Tracker Usage @@ -8,23 +8,17 @@ - + From fdrake@users.sourceforge.net Tue Jun 4 22:02:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:02:02 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.2,1.3 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv2222 Modified Files: relreqs-1-95-4.html Log Message: Fix the page title. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- relreqs-1-95-4.html 5 Jun 2002 03:56:04 -0000 1.2 +++ relreqs-1-95-4.html 5 Jun 2002 04:01:38 -0000 1.3 @@ -1,6 +1,6 @@ - Development of Expat + Expat 1.95.4 Requirements @@ -8,7 +8,7 @@ - + Index: trackers.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/trackers.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- trackers.html 5 Jun 2002 04:01:10 -0000 1.2 +++ trackers.html 13 Jun 2002 20:41:24 -0000 1.3 @@ -16,9 +16,239 @@ From fdrake@users.sourceforge.net Thu Jun 13 14:45:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 13:45:03 2002 Subject: [Expat-checkins] htdocs style.css,1.2,1.3 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv19843 Modified Files: style.css Log Message: Simplify the content table style, with no visual difference. (Possibly better supported by browsers.) Index: style.css =================================================================== RCS file: /cvsroot/expat/htdocs/style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- style.css 13 Jun 2002 20:40:09 -0000 1.2 +++ style.css 13 Jun 2002 20:44:20 -0000 1.3 @@ -21,6 +21,4 @@ margin: 0em; border-width: 0px; vertical-align: baseline; - border-top: 2px solid rgb(110,139,61); } - -.content tr:first-child td { border-top: 0px; } + border-bottom: 2px solid rgb(110,139,61); } From fdrake@users.sourceforge.net Fri Jun 14 08:12:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 14 07:12:05 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.3,1.4 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv2360 Modified Files: relreqs-1-95-4.html Log Message: Mark the SkippedEntityHandler item "done". Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- relreqs-1-95-4.html 5 Jun 2002 04:01:38 -0000 1.3 +++ relreqs-1-95-4.html 14 Jun 2002 14:11:56 -0000 1.4 @@ -27,7 +27,8 @@
  • The SkippedEntityHandler patch should be checked in and thoroughly debugged.
    See SF patch #559910 + "http://sourceforge.net/tracker/index.php?func=detail&aid=559910&group_id=10127&atid=310127" >SF patch #559910
    + Status: Done.

  • The InternalEntityRefHandler feature needs to be implemented and tested.
    From fdrake@users.sourceforge.net Fri Jun 14 08:14:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 14 07:14:04 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.4,1.5 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv3018 Modified Files: relreqs-1-95-4.html Log Message: Stupid punctuation nit: use a period at the end of a sentence! ;-) Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- relreqs-1-95-4.html 14 Jun 2002 14:11:56 -0000 1.4 +++ relreqs-1-95-4.html 14 Jun 2002 14:13:30 -0000 1.5 @@ -27,7 +27,7 @@
  • The SkippedEntityHandler patch should be checked in and thoroughly debugged.
    See SF patch #559910
    + "http://sourceforge.net/tracker/index.php?func=detail&aid=559910&group_id=10127&atid=310127" >SF patch #559910.
    Status: Done.

  • The InternalEntityRefHandler feature needs to be implemented From fdrake@users.sourceforge.net Fri Jun 14 08:29:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 14 07:29:02 2002 Subject: [Expat-checkins] expat/win32 expat.iss,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv7728 Modified Files: expat.iss Log Message: Version number needs to be bumped here as well. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- expat.iss 13 Jun 2002 18:12:20 -0000 1.10 +++ expat.iss 14 Jun 2002 14:28:12 -0000 1.11 @@ -7,15 +7,15 @@ [Setup] AppName=expat AppId=expat -AppVersion=1.95.3 -AppVerName=expat 1.95.3 +AppVersion=1.95.4 +AppVerName=expat 1.95.4 AppCopyright=Copyright © 1998-2002 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers -DefaultDirName={sd}\Expat-1.95.3 +DefaultDirName={sd}\Expat-1.95.4 AppPublisher=The Expat Developers AppPublisherURL=http://www.libexpat.org/ AppSupportURL=http://www.libexpat.org/ AppUpdatesURL=http://www.libexpat.org/ -UninstallDisplayName=Expat XML Parser (version 1.95.3) +UninstallDisplayName=Expat XML Parser (version 1.95.4) UninstallFilesDir={app}\Uninstall Compression=bzip/9 From fdrake@users.sourceforge.net Tue Jun 18 20:27:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 18 19:27:01 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.5,1.6 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv3980 Modified Files: relreqs-1-95-4.html Log Message: Add the "replace-tabs-with-spaces" release requirement, as discussed on the lists. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- relreqs-1-95-4.html 14 Jun 2002 14:13:30 -0000 1.5 +++ relreqs-1-95-4.html 19 Jun 2002 02:26:04 -0000 1.6 @@ -42,6 +42,12 @@

  • The build process on Unix should create both libexpat.{a,so} and libexpatw.{a,so} by default. +

    +

  • Hard tab characters will be removed from all source files. + They will be replaced with spaces.
    + See SF bug #570903.

    Delayed Requirements

    From fdrake@users.sourceforge.net Wed Jun 26 06:55:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Wed Jun 26 05:55:05 2002 Subject: [Expat-checkins] htdocs index.html,1.22,1.23 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv24998 Modified Files: index.html Log Message: Add a link to the Expat4D product (Expat plug-in for 4th Dimension). Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- index.html 11 Jun 2002 19:34:39 -0000 1.22 +++ index.html 26 Jun 2002 12:54:32 -0000 1.23 @@ -148,6 +148,10 @@ "SAX for Pascal" interface specs
    • +
  • + Expat4D is a plug-in + for the 4th Dimension application + framework.
    • From fdrake@users.sourceforge.net Wed Jun 26 07:05:13 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Wed Jun 26 06:05:13 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.6,1.7 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv28452 Modified Files: relreqs-1-95-4.html Log Message: Mark one more of the release requirements as done. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- relreqs-1-95-4.html 19 Jun 2002 02:26:04 -0000 1.6 +++ relreqs-1-95-4.html 26 Jun 2002 13:04:04 -0000 1.7 @@ -38,7 +38,8 @@

  • SF bug #441449 should be resolved. + >SF bug #441449 should be resolved.
    + Status: Done.

  • The build process on Unix should create both libexpat.{a,so} and libexpatw.{a,so} by default. From fdrake@users.sourceforge.net Thu Jun 27 22:03:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 27 21:03:02 2002 Subject: [Expat-checkins] htdocs/dev cvs.html,1.1,1.2 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv31103 Modified Files: cvs.html Log Message: Add a link to the ViewCVS repository browser. Index: cvs.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/cvs.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cvs.html 13 Jun 2002 18:34:14 -0000 1.1 +++ cvs.html 28 Jun 2002 04:02:45 -0000 1.2 @@ -15,6 +15,13 @@
    • -

    This area contains information for the developers and maintainers -of Expat. +

    This document describes the use of the SourceForge bug & patch +trackers by the Expat maintainers.

    - +

    Or rather, it will once I find time to write it up.
    From fdrake@users.sourceforge.net Tue Jun 4 22:03:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:03:03 2002 Subject: [Expat-checkins] htdocs Makefile,1.1,1.2 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv2408 Modified Files: Makefile Log Message: Include subdirectories on the webserver. Index: Makefile =================================================================== RCS file: /cvsroot/expat/htdocs/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 30 May 2002 19:03:07 -0000 1.1 +++ Makefile 5 Jun 2002 04:02:19 -0000 1.2 @@ -2,4 +2,4 @@ HOST=expat.sourceforge.net install: - ssh $(HOST) cd $(DIR) '&&' cvs up + ssh $(HOST) cd $(DIR) '&&' cvs up -P -d From fdrake@users.sourceforge.net Tue Jun 4 22:14:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:14:01 2002 Subject: [Expat-checkins] expat/vms README.vms,NONE,1.1 descrip.mms,NONE,1.1 expat_config.h,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/vms In directory usw-pr-cvs1:/tmp/cvs-serv4343/vms Added Files: README.vms descrip.mms expat_config.h Log Message: VMS support, contributed by Craig Berry. --- NEW FILE: README.vms --- 4-jun-2002 Craig A. Berry Added rudimentary build procedures for OpenVMS based on work by Martin Vorlaender. You'll need MMS or its freeware equivalent MMK. Just go to the top-level directory and type $ MMS/DESCRIPTION=[.vms] or $ MMK/DESCRIPTION=[.vms] You'll end up with the object library expat.olb. For now, installation consists merely of copying the object library, include files, and documentation to a suitable location. To-do list: -- create a shareable image -- build and run the tests and build the xmlwf utility -- create an install target --- NEW FILE: descrip.mms --- # Bare bones description file (Makefile) for OpenVMS PACKAGE = expat VERSION = 1.95.3 EXPAT_MAJOR_VERSION=1 EXPAT_MINOR_VERSION=95 EXPAT_EDIT=3 O = .obj OLB = .olb LIBRARY = expat$(OLB) LIBDIR = [.lib] SOURCES = $(LIBDIR)xmlparse.c $(LIBDIR)xmltok.c $(LIBDIR)xmlrole.c OBJECTS = xmlparse$(O) xmltok$(O) xmlrole$(O) TEMPLATES = xmltok_impl.c xmltok_ns.c APIHEADER = $(LIBDIR)expat.h HEADERS = $(LIBDIR)ascii.h $(LIBDIR)iasciitab.h $(LIBDIR)utf8tab.h $(LIBDIR)xmltok.h \ $(LIBDIR)asciitab.h $(LIBDIR)latin1tab.h \ $(LIBDIR)nametab.h $(LIBDIR)xmldef.h $(LIBDIR)xmlrole.h $(LIBDIR)xmltok_impl.h CONFIG_HEADER = expat_config.h INCLUDES = /INCLUDE=([],[.lib]) DEFS = /DEFINE=(PACKAGE="""$(PACKAGE)""",VERSION="""$(PACKAGE)_$(VERSION)""") LIBREVISION = 0 LIBCURRENT = 1 LIBAGE = 0 # COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) # # DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEMPLATES) $(APIHEADER) $(HEADERS) # # TAR = gtar # GZIP_ENV = --best # .FIRST : IF F$SEARCH("$(LIBRARY)") .EQS. "" THEN $(LIBR) /CREATE /OBJECT $(LIBRARY) all : $(LIBRARY) .SUFFIXES : .SUFFIXES : $(OLB) $(O) .C .H .c$(O) : $(COMPILE) $(MMS$SOURCE) $(O)$(OLB) : @ IF F$SEARCH("$(MMS$TARGET)") .EQS. "" - THEN LIBRARY/CREATE/LOG $(MMS$TARGET) @ LIBRARY /REPLACE /LOG $(MMS$TARGET) $(MMS$SOURCE) clean : DELETE $(LIBRARY);*,*$(O);* $(LIBRARY) : $(LIBRARY)( $(OBJECTS) ) $(LIBR) /COMPRESS $(MMS$TARGET) $(CONFIG_HEADER) : [.vms]expat_config.h COPY/LOG $(MMS$SOURCE) $(MMS$TARGET) xmlparse$(O) : $(LIBDIR)xmlparse.c $(LIBDIR)expat.h $(LIBDIR)xmlrole.h $(LIBDIR)xmltok.h $(CONFIG_HEADER) xmlrole$(O) : $(LIBDIR)xmlrole.c $(LIBDIR)ascii.h $(LIBDIR)xmlrole.h $(CONFIG_HEADER) xmltok$(O) : $(LIBDIR)xmltok.c $(LIBDIR)xmltok_impl.c $(LIBDIR)xmltok_ns.c \ $(LIBDIR)ascii.h $(LIBDIR)asciitab.h $(LIBDIR)iasciitab.h $(LIBDIR)latin1tab.h \ $(LIBDIR)nametab.h $(LIBDIR)utf8tab.h $(LIBDIR)xmltok.h $(LIBDIR)xmltok_impl.h $(CONFIG_HEADER) --- NEW FILE: expat_config.h --- /* Copyright 2000, Clark Cooper All rights reserved. This is free software. You are permitted to copy, distribute, or modify it under the terms of the MIT/X license (contained in the COPYING file with this distribution.) */ /* Define to empty if the keyword does not work. */ #undef const /* Define if you have a working `mmap' system call. */ #undef HAVE_MMAP /* Define to `long' if doesn't define. */ #undef off_t /* Define to `unsigned' if doesn't define. */ #undef size_t /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN /* Define if you have the bcopy function. */ #undef HAVE_BCOPY /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE /* Define if you have the memmove function. */ #define HAVE_MEMMOVE 1 /* Define if you have the header file. */ #undef HAVE_FCNTL_H /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 #define XML_NS #define XML_DTD #ifdef WORDS_BIGENDIAN #define XML_BYTE_ORDER 21 #else #define XML_BYTE_ORDER 12 #endif #define XML_CONTEXT_BYTES 1024 #ifndef HAVE_MEMMOVE #ifdef HAVE_BCOPY #define memmove(d,s,l) bcopy((s),(d),(l)) #else #define memmove(d,s,l) ;punting on memmove; #endif #endif From fdrake@users.sourceforge.net Tue Jun 4 22:14:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:14:01 2002 Subject: [Expat-checkins] expat MANIFEST,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv4343 Modified Files: MANIFEST Log Message: VMS support, contributed by Craig Berry. Index: MANIFEST =================================================================== RCS file: /cvsroot/expat/expat/MANIFEST,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- MANIFEST 31 May 2002 15:15:18 -0000 1.14 +++ MANIFEST 5 Jun 2002 04:13:10 -0000 1.15 @@ -42,6 +42,9 @@ tests/chardata.h tests/runtests.c tests/xmltest.sh +vms/descrip.mms +vms/expat_config.h +vms/README.vms xmlwf/codepage.c xmlwf/codepage.h xmlwf/ct.c From fdrake@users.sourceforge.net Tue Jun 4 22:14:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:14:01 2002 Subject: [Expat-checkins] expat/lib expat.h,1.22,1.23 xmlparse.c,1.41,1.42 xmlrole.h,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv4343/lib Modified Files: expat.h xmlparse.c xmlrole.h Log Message: VMS support, contributed by Craig Berry. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- expat.h 22 May 2002 04:04:39 -0000 1.22 +++ expat.h 5 Jun 2002 04:13:10 -0000 1.23 @@ -5,6 +5,15 @@ #ifndef XmlParse_INCLUDED #define XmlParse_INCLUDED 1 +#ifdef __VMS +/* 0 1 2 3 0 1 2 3 + 1234567890123456789012345678901 1234567890123456789012345678901 */ +#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler +#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler +#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler +#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg +#endif + #include #ifndef XMLPARSEAPI Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- xmlparse.c 23 May 2002 18:50:51 -0000 1.41 +++ xmlparse.c 5 Jun 2002 04:13:10 -0000 1.42 @@ -2,6 +2,10 @@ See the file COPYING for copying permission. */ +#ifdef __VMS +#include /* memset(), memcpy() */ +#endif + #ifdef COMPILED_FROM_DSP #include "winconfig.h" Index: xmlrole.h =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlrole.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- xmlrole.h 18 May 2002 03:34:44 -0000 1.4 +++ xmlrole.h 5 Jun 2002 04:13:10 -0000 1.5 @@ -6,6 +6,12 @@ #ifndef XmlRole_INCLUDED #define XmlRole_INCLUDED 1 +#ifdef __VMS +/* 0 1 2 3 0 1 2 3 + 1234567890123456789012345678901 1234567890123456789012345678901 */ +#define XmlPrologStateInitExternalEntity XmlPrologStateInitExternalEnt +#endif + #include "xmltok.h" #ifdef __cplusplus From fdrake@users.sourceforge.net Tue Jun 4 22:17:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 4 21:17:01 2002 Subject: [Expat-checkins] expat Changes,1.13,1.14 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv4981 Modified Files: Changes Log Message: Started section for 1.95.4, noting the contributed VMS support. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Changes 31 May 2002 20:42:18 -0000 1.13 +++ Changes 5 Jun 2002 04:16:29 -0000 1.14 @@ -1,3 +1,7 @@ +Release 1.95.4 (eventually) + - Added support for VMS, contributed by Craig Berry. See + vms/README.vms for more information. + Release 1.95.3 Mon Jun 3 2002 - Added a project to the MSVC workspace to create a wchar_t version of the library; the DLLs are named libexpatw.dll. From kwaclaw@users.sourceforge.net Sat Jun 8 18:02:02 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Sat Jun 8 17:02:02 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.42,1.43 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv32099 Modified Files: xmlparse.c Log Message: Applied patch # 559910 - New SkippedEntityHandler Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- xmlparse.c 5 Jun 2002 04:13:10 -0000 1.42 +++ xmlparse.c 9 Jun 2002 00:01:30 -0000 1.43 @@ -417,6 +417,7 @@ XML_NotStandaloneHandler m_notStandaloneHandler; XML_ExternalEntityRefHandler m_externalEntityRefHandler; void *m_externalEntityRefHandlerArg; + XML_SkippedEntityHandler m_skippedEntityHandler; XML_UnknownEncodingHandler m_unknownEncodingHandler; XML_ElementDeclHandler m_elementDeclHandler; XML_AttlistDeclHandler m_attlistDeclHandler; @@ -500,6 +501,7 @@ #define externalEntityRefHandler (((Parser *)parser)->m_externalEntityRefHandler) #define externalEntityRefHandlerArg (((Parser *)parser)->m_externalEntityRefHandlerArg) #define internalEntityRefHandler (((Parser *)parser)->m_internalEntityRefHandler) +#define skippedEntityHandler (((Parser *)parser)->m_skippedEntityHandler) #define unknownEncodingHandler (((Parser *)parser)->m_unknownEncodingHandler) #define elementDeclHandler (((Parser *)parser)->m_elementDeclHandler) #define attlistDeclHandler (((Parser *)parser)->m_attlistDeclHandler) @@ -708,6 +710,7 @@ notStandaloneHandler = NULL; externalEntityRefHandler = NULL; externalEntityRefHandlerArg = parser; + skippedEntityHandler = NULL; unknownEncodingHandler = NULL; elementDeclHandler = NULL; attlistDeclHandler = NULL; @@ -798,6 +801,7 @@ XML_EndNamespaceDeclHandler oldEndNamespaceDeclHandler = endNamespaceDeclHandler; XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler; XML_ExternalEntityRefHandler oldExternalEntityRefHandler = externalEntityRefHandler; + XML_SkippedEntityHandler oldSkippedEntityHandler = skippedEntityHandler; XML_UnknownEncodingHandler oldUnknownEncodingHandler = unknownEncodingHandler; XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler; XML_AttlistDeclHandler oldAttlistDeclHandler = attlistDeclHandler; @@ -844,6 +848,7 @@ endNamespaceDeclHandler = oldEndNamespaceDeclHandler; notStandaloneHandler = oldNotStandaloneHandler; externalEntityRefHandler = oldExternalEntityRefHandler; + skippedEntityHandler = oldSkippedEntityHandler; unknownEncodingHandler = oldUnknownEncodingHandler; elementDeclHandler = oldElementDeclHandler; attlistDeclHandler = oldAttlistDeclHandler; @@ -1118,6 +1123,12 @@ externalEntityRefHandlerArg = parser; } +void XML_SetSkippedEntityHandler(XML_Parser parser, + XML_SkippedEntityHandler handler) +{ + skippedEntityHandler = handler; +} + void XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, void *data) @@ -1626,7 +1637,7 @@ XML_Char ch = (XML_Char) XmlPredefinedEntityName(enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar); - if (ch) { + if (ch) { if (characterDataHandler) characterDataHandler(handlerArg, &ch, 1); else if (defaultHandler) @@ -1642,9 +1653,11 @@ poolDiscard(&dtd.pool); if (!entity) { if (!hadExternalDoctype || dtd.standalone) - return XML_ERROR_UNDEFINED_ENTITY; - if (defaultHandler) - reportDefault(parser, enc, s, next); + return XML_ERROR_UNDEFINED_ENTITY; + if (skippedEntityHandler) + skippedEntityHandler(handlerArg, name, 0); + else if (defaultHandler) + reportDefault(parser, enc, s, next); break; } if (entity->open) @@ -1655,8 +1668,11 @@ if (entity->textPtr) { enum XML_Error result; OPEN_INTERNAL_ENTITY openEntity; - if (defaultHandler && !defaultExpandInternalEntities) { - reportDefault(parser, enc, s, next); + if (!defaultExpandInternalEntities) { + if (skippedEntityHandler) + skippedEntityHandler(handlerArg, entity->name, 0); + else if (defaultHandler) + reportDefault(parser, enc, s, next); break; } entity->open = 1; @@ -1665,7 +1681,7 @@ openEntity.entity = entity; openEntity.internalEventPtr = NULL; openEntity.internalEventEndPtr = NULL; - result = doContent(parser, + result = doContent(parser, tagLevel, internalEncoding, (char *)entity->textPtr, @@ -3417,6 +3433,8 @@ if (!entity) { if (!hadExternalDoctype || dtd.standalone) return XML_ERROR_UNDEFINED_ENTITY; + if (skippedEntityHandler) + skippedEntityHandler(handlerArg, name, 1); break; } if (entity->open) @@ -3782,6 +3800,8 @@ eventPtr = ptr; return XML_ERROR_UNDEFINED_ENTITY; } + if (skippedEntityHandler) + skippedEntityHandler(handlerArg, name, 0); } else if (entity->open) { if (enc == encoding) @@ -3903,7 +3923,10 @@ /* in the internal subset, PE references are not allowed within markup declarations */ eventPtr = entityTextPtr; - result = XML_ERROR_SYNTAX; + if (prologState.documentEntity) + result = XML_ERROR_PARAM_ENTITY_REF; + else + result = XML_ERROR_SYNTAX; goto endEntityValue; case XML_TOK_NONE: result = XML_ERROR_NONE; From kwaclaw@users.sourceforge.net Sat Jun 8 18:02:02 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Sat Jun 8 17:02:02 2002 Subject: [Expat-checkins] expat/lib expat.h,1.23,1.24 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv32158 Modified Files: expat.h Log Message: Applied patch # 559910 - New SkippedEntityHandler Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- expat.h 5 Jun 2002 04:13:10 -0000 1.23 +++ expat.h 9 Jun 2002 00:01:43 -0000 1.24 @@ -190,7 +190,7 @@ Added in Expat 1.95.3. */ XMLPARSEAPI(int) -XML_ParserReset(XML_Parser parser, const XML_Char *encodingName); +XML_ParserReset(XML_Parser parser, const XML_Char *encoding); /* atts is array of name/value pairs, terminated by 0; names and values are 0 terminated. @@ -366,6 +366,16 @@ const XML_Char *systemId, const XML_Char *publicId); +/* This is called in two situations: + 1) An entity reference is encountered for which no declaration + has been read *and* this is not an error. + 2) An internal entity reference is read, but not expanded, because + XML_SetDefaultHandler has been called. +*/ +typedef void (*XML_SkippedEntityHandler)(void *userData, + const XML_Char *entityName, + int is_parameter_entity); + /* This structure is filled in by the XML_UnknownEncodingHandler to provide information to the parser about encodings that are unknown to the parser. @@ -480,8 +490,8 @@ XML_EndCdataSectionHandler end); /* This sets the default handler and also inhibits expansion of - internal entities. The entity reference will be passed to the - default handler. + internal entities. These entity references will be passed to the + default handler, or to the skipped entity handler, if one is set. */ XMLPARSEAPI(void) XML_SetDefaultHandler(XML_Parser parser, @@ -543,6 +553,10 @@ */ XMLPARSEAPI(void) XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg); + +XMLPARSEAPI(void) +XML_SetSkippedEntityHandler(XML_Parser parser, + XML_SkippedEntityHandler handler); XMLPARSEAPI(void) XML_SetUnknownEncodingHandler(XML_Parser parser, From kwaclaw@users.sourceforge.net Sun Jun 9 07:56:04 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Sun Jun 9 06:56:04 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.43,1.44 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv10067 Modified Files: xmlparse.c Log Message: Applied patch # 565510 - "reading uninitialized variable". Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- xmlparse.c 9 Jun 2002 00:01:30 -0000 1.43 +++ xmlparse.c 9 Jun 2002 13:55:37 -0000 1.44 @@ -3617,7 +3617,7 @@ processor = epilogProcessor; eventPtr = s; for (;;) { - const char *next; + const char *next = NULL; int tok = XmlPrologTok(encoding, s, end, &next); eventEndPtr = next; switch (tok) { From kwaclaw@users.sourceforge.net Sun Jun 9 08:02:08 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Sun Jun 9 07:02:08 2002 Subject: [Expat-checkins] expat/lib xmltok.c,1.16,1.17 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv11614 Modified Files: xmltok.c Log Message: Fix for bug # 566240. Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- xmltok.c 30 May 2002 18:02:59 -0000 1.16 +++ xmltok.c 9 Jun 2002 14:01:47 -0000 1.17 @@ -67,7 +67,9 @@ : 0)) /* Detection of invalid UTF-8 sequences is based on Table 3.1B - of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/. + of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/ + with the additional restriction of not allowing the Unicode + code points 0xFFFF and 0xFFFE (sequences EF,BF,BF and EF,BF,BE). Implementation details: (A & 0x80) == 0 means A < 0x80 and @@ -78,7 +80,9 @@ ((*p) < 0xC2 || ((p)[1] & 0x80) == 0 || ((p)[1] & 0xC0) == 0xC0) #define UTF8_INVALID3(p) \ - (((p)[2] & 0x80) == 0 || ((p)[2] & 0xC0) == 0xC0 \ + (((p)[2] & 0x80) == 0 \ + || \ + ((*p) == 0xEF ? (p)[2] > 0xBD : ((p)[2] & 0xC0) == 0xC0) \ || \ ((*p) == 0xE0 \ ? \ From fdrake@users.sourceforge.net Tue Jun 11 13:35:06 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jun 11 12:35:06 2002 Subject: [Expat-checkins] htdocs index.html,1.21,1.22 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv30427 Modified Files: index.html Log Message: Added a link to the EasySoap project. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- index.html 5 Jun 2002 03:52:21 -0000 1.21 +++ index.html 11 Jun 2002 19:34:39 -0000 1.22 @@ -113,6 +113,9 @@ C++ interface to Expat (old; not updated since Expat 1.2)
  • + EasySoap is a C++ + SOAP implementation which uses Expat. +
  • The GOBO project is working on an Eiffel binding for Expat. Development appears to have slowed, and there isn't any status information about From fdrake@users.sourceforge.net Wed Jun 12 13:44:06 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Wed Jun 12 12:44:06 2002 Subject: [Expat-checkins] expat/lib expat.h,1.24,1.25 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv5452 Modified Files: expat.h Log Message: There've been patches since 1.95.3, so bump the version number. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- expat.h 9 Jun 2002 00:01:43 -0000 1.24 +++ expat.h 12 Jun 2002 19:43:51 -0000 1.25 @@ -805,7 +805,7 @@ */ #define XML_MAJOR_VERSION 1 #define XML_MINOR_VERSION 95 -#define XML_MICRO_VERSION 3 +#define XML_MICRO_VERSION 4 #ifdef __cplusplus } From fdrake@users.sourceforge.net Wed Jun 12 13:47:10 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Wed Jun 12 12:47:10 2002 Subject: [Expat-checkins] expat configure.in,1.30,1.31 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv6554 Modified Files: configure.in Log Message: Update the DLL version numbering since the API has expanded in a backward-compatible way. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- configure.in 31 May 2002 21:31:12 -0000 1.30 +++ configure.in 12 Jun 2002 19:46:53 -0000 1.31 @@ -44,9 +44,9 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=2 +LIBCURRENT=3 LIBREVISION=0 -LIBAGE=2 +LIBAGE=3 AC_CONFIG_HEADER(expat_config.h) From fdrake@users.sourceforge.net Wed Jun 12 20:53:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Wed Jun 12 19:53:02 2002 Subject: [Expat-checkins] expat/xmlwf xmlfile.c,1.9,1.10 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv29036/xmlwf Modified Files: xmlfile.c Log Message: Include unistd.h when HAVE_UNISTD_H is defined, not _POSIX_SOURCE. This requires that expat_config.h or winconfig.h has been included. Using unistd.h avoids warnings about close() and read() not being defined on some platforms. This closes SF bug #563184. Index: xmlfile.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- xmlfile.c 19 Apr 2002 21:41:54 -0000 1.9 +++ xmlfile.c 13 Jun 2002 02:52:09 -0000 1.10 @@ -8,6 +8,11 @@ #include #include #include +#ifdef COMPILED_FROM_DSP +#include "winconfig.h" +#else +#include "expat_config.h" +#endif #include "expat.h" #include "xmlfile.h" #include "xmltchar.h" @@ -17,7 +22,7 @@ #include #endif -#ifdef _POSIX_SOURCE +#ifdef HAVE_UNISTD_H #include #endif From kwaclaw@users.sourceforge.net Thu Jun 13 06:53:02 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Thu Jun 13 05:53:02 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.44,1.45 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv2204 Modified Files: xmlparse.c Log Message: Applied patch # 567035 (endElementHandler fix) and patch # 567400 (cdataSectionProcessor fix) Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- xmlparse.c 9 Jun 2002 13:55:37 -0000 1.44 +++ xmlparse.c 13 Jun 2002 12:52:39 -0000 1.45 @@ -137,7 +137,9 @@ typedef struct { const XML_Char *str; const XML_Char *localPart; + const XML_Char *prefix; int uriLen; + int prefixLen; } TAG_NAME; typedef struct tag { @@ -864,10 +866,10 @@ externalEntityRefHandlerArg = oldExternalEntityRefHandlerArg; defaultExpandInternalEntities = oldDefaultExpandInternalEntities; ns_triplets = oldns_triplets; + parentParser = oldParser; #ifdef XML_DTD paramEntityParsing = oldParamEntityParsing; prologState.inEntityValue = oldInEntityValue; - parentParser = oldParser; if (context) { #endif /* XML_DTD */ if (!dtdCopy(&dtd, oldDtd, parser) || !setContext(parser, context)) { @@ -1741,6 +1743,7 @@ tag->parent = tagStack; tagStack = tag; tag->name.localPart = NULL; + tag->name.prefix = NULL; tag->rawName = s + enc->minBytesPerChar; tag->rawNameLength = XmlNameLength(enc, tag->rawName); if (nextPtr) { @@ -1786,7 +1789,7 @@ char *temp = REALLOC(tag->buf, bufSize); if (temp == NULL) return XML_ERROR_NO_MEMORY; - tag->buf = temp; + tag->buf = temp; } tag->bufEnd = tag->buf + bufSize; if (nextPtr) @@ -1870,7 +1873,26 @@ return XML_ERROR_TAG_MISMATCH; } --tagLevel; - if (endElementHandler && tag->name.str) { + if (endElementHandler && tag->name.str) { + const XML_Char *localPart; + const XML_Char *prefix; + XML_Char *uri; + localPart = tag->name.localPart; + if (ns && localPart) { + /* localPart and prefix may have been overwritten in + tag->name.str, since this points to the binding->uri + buffer which gets re-used; so we have to add them again + */ + uri = (XML_Char *)tag->name.str + tag->name.uriLen; + /* don't need to check for space - already done in storeAtts() */ + while (*localPart) *uri++ = *localPart++; + prefix = (XML_Char *)tag->name.prefix; + if (ns_triplets && prefix) { + *uri++ = namespaceSeparator; + while (*prefix) *uri++ = *prefix++; + } + *uri = XML_T('\0'); + } endElementHandler(handlerArg, tag->name.str); } else if (defaultHandler) @@ -2236,6 +2258,8 @@ } tagNamePtr->localPart = localPart; tagNamePtr->uriLen = binding->uriLen; + tagNamePtr->prefix = binding->prefix->name; + tagNamePtr->prefixLen = prefixLen; for (i = 0; localPart[i++];) ; n = i + binding->uriLen + prefixLen; @@ -2327,8 +2351,14 @@ enum XML_Error result = doCdataSection(parser, encoding, &start, end, endPtr); if (start) { - processor = contentProcessor; - return contentProcessor(parser, start, end, endPtr); + if (parentParser) { /* we are parsing an external entity */ + processor = externalEntityContentProcessor; + return externalEntityContentProcessor(parser, start, end, endPtr); + } + else { + processor = contentProcessor; + return contentProcessor(parser, start, end, endPtr); + } } return result; } From fdrake@users.sourceforge.net Thu Jun 13 12:13:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 11:13:03 2002 Subject: [Expat-checkins] expat/win32 expat.iss,1.9,1.10 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv16577/win32 Modified Files: expat.iss Log Message: Consistently use the shorter libexpat.org URL. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- expat.iss 1 Jun 2002 02:12:30 -0000 1.9 +++ expat.iss 13 Jun 2002 18:12:20 -0000 1.10 @@ -12,9 +12,9 @@ AppCopyright=Copyright © 1998-2002 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers DefaultDirName={sd}\Expat-1.95.3 AppPublisher=The Expat Developers -AppPublisherURL=http://expat.sourceforge.net/ -AppSupportURL=http://expat.sourceforge.net/ -AppUpdatesURL=http://expat.sourceforge.net/ +AppPublisherURL=http://www.libexpat.org/ +AppSupportURL=http://www.libexpat.org/ +AppUpdatesURL=http://www.libexpat.org/ UninstallDisplayName=Expat XML Parser (version 1.95.3) UninstallFilesDir={app}\Uninstall From fdrake@users.sourceforge.net Thu Jun 13 12:13:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 11:13:04 2002 Subject: [Expat-checkins] expat make-release.sh,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv16577 Modified Files: make-release.sh Log Message: Consistently use the shorter libexpat.org URL. Index: make-release.sh =================================================================== RCS file: /cvsroot/expat/expat/make-release.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- make-release.sh 18 May 2002 00:26:59 -0000 1.2 +++ make-release.sh 13 Jun 2002 18:12:19 -0000 1.3 @@ -19,7 +19,7 @@ fi echo "Checking out into temporary area: $tmpdir" -cvs -d :pserver:anonymous@cvs.expat.sourceforge.net:/cvsroot/expat export -r "$1" -d $tmpdir expat || exit 1 +cvs -d :pserver:anonymous@cvs.libexpat.org:/cvsroot/expat export -r "$1" -d $tmpdir expat || exit 1 echo "" echo "----------------------------------------------------------------------" From fdrake@users.sourceforge.net Thu Jun 13 12:13:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 11:13:04 2002 Subject: [Expat-checkins] expat/doc reference.html,1.11,1.12 xmlwf.sgml,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/doc In directory usw-pr-cvs1:/tmp/cvs-serv16577/doc Modified Files: reference.html xmlwf.sgml Log Message: Consistently use the shorter libexpat.org URL. Index: reference.html =================================================================== RCS file: /cvsroot/expat/expat/doc/reference.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- reference.html 13 Aug 2001 19:10:09 -0000 1.11 +++ reference.html 13 Jun 2002 18:12:20 -0000 1.12 @@ -27,7 +27,7 @@

    This is free software, licensed under the MIT/X Consortium license. You may download it from -the expat homepage on Source Forge. +the Expat home page.

    The bulk of this document was originally commissioned as an article by Index: xmlwf.sgml =================================================================== RCS file: /cvsroot/expat/expat/doc/xmlwf.sgml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xmlwf.sgml 21 Feb 2002 21:27:55 -0000 1.1 +++ xmlwf.sgml 13 Jun 2002 18:12:20 -0000 1.2 @@ -403,7 +403,7 @@ -The Expat home page: http://expat.sourceforge.net/ +The Expat home page: http://www.libexpat.org/ The W3 XML specification: http://www.w3.org/TR/REC-xml From fdrake@users.sourceforge.net Thu Jun 13 12:35:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 11:35:05 2002 Subject: [Expat-checkins] htdocs/dev cvs.html,NONE,1.1 index.html,1.2,1.3 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv26897 Modified Files: index.html Added Files: cvs.html Log Message: Add a section on CVS access, since we can't change the CVS info on SourceForge to use the shorter hostnames. This adds information on the specific modules checked into CVS. --- NEW FILE: cvs.html --- CVS Access to Expat

    Anonymous CVS Access

    The Expat CVS repository can be checked out through anonymous (pserver) CVS with the following instructions. The module you wish to check out must be specified as the modulename. When prompted for a password for anonymous, simply press the Enter key.

    cvs -d:pserver:anonymous@cvs.libexpat.org:/cvsroot/expat login

cvs -z3 -d:pserver:anonymous@cvs.libexpat.org:/cvsroot/expat co modulename

    Updates from within the module's directory do not need the -d parameter.

    Developer CVS Access via SSH

    Only project developers can access the CVS tree via this method. SSH1 must be installed on your client machine. Substitute modulename with the name of the source module you want to check out, and developername with your SourceForge user name. Enter your site password when prompted.

    export CVS_RSH=ssh

cvs -z3 -d:ext:developername@cvs.libexpat.org:/cvsroot/expat co modulename

    Source Modules

    There are only two source modules for Expat at this time. They are:

    expat
    This contains the C source code for the library, xmlwf, example applications, and test suite. This is what most people will be interested in.
    htdocs
    The content for www.libexpat.org is located in this module.
    SourceForge Logo
    Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.html 5 Jun 2002 03:56:04 -0000 1.2 +++ index.html 13 Jun 2002 18:34:14 -0000 1.3 @@ -16,15 +16,18 @@

    • This area contains information for the developers and maintainers -of Expat. +of Expat.

    From gstein@lyra.org Thu Jun 13 12:48:04 2002 From: gstein@lyra.org (Greg Stein) Date: Thu Jun 13 11:48:04 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.44,1.45 In-Reply-To: ; from kwaclaw@users.sourceforge.net on Thu, Jun 13, 2002 at 05:52:41AM -0700 References: Message-ID: <20020613114931.G24721@lyra.org> On Thu, Jun 13, 2002 at 05:52:41AM -0700, kwaclaw@users.sourceforge.net wrote: >... > +++ xmlparse.c 13 Jun 2002 12:52:39 -0000 1.45 >... > @@ -1741,6 +1743,7 @@ > tag->parent = tagStack; > tagStack = tag; > tag->name.localPart = NULL; > + tag->name.prefix = NULL; The indentation is off here. It looks like your new line uses spaces (good!) but the surrounding lines use tabs. Any opinions on "detabifying" the source code? (that is: convert all tabs to spaces, and state that the "style" is no-tabs) Cheers, -g -- Greg Stein, http://www.lyra.org/ From karl@waclawek.net Thu Jun 13 12:54:07 2002 From: karl@waclawek.net (Karl Waclawek) Date: Thu Jun 13 11:54:07 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.44,1.45 References: <20020613114931.G24721@lyra.org> Message-ID: <003501c2130b$a2bbf470$9e539696@citkwaclaww2k> > On Thu, Jun 13, 2002 at 05:52:41AM -0700, kwaclaw@users.sourceforge.net wrote: > >... > > +++ xmlparse.c 13 Jun 2002 12:52:39 -0000 1.45 > >... > > @@ -1741,6 +1743,7 @@ > > tag->parent = tagStack; > > tagStack = tag; > > tag->name.localPart = NULL; > > + tag->name.prefix = NULL; > > The indentation is off here. It looks like your new line uses spaces (good!) > but the surrounding lines use tabs. > > Any opinions on "detabifying" the source code? (that is: convert all tabs to > spaces, and state that the "style" is no-tabs) Yes, I would like spaces only. Btw, to be honest, I don't like this "reverse indentation" style just to make it fit into 80 character lines. Karl From gstein@lyra.org Thu Jun 13 13:00:08 2002 From: gstein@lyra.org (Greg Stein) Date: Thu Jun 13 12:00:08 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.44,1.45 In-Reply-To: <003501c2130b$a2bbf470$9e539696@citkwaclaww2k>; from karl@waclawek.net on Thu, Jun 13, 2002 at 02:53:40PM -0400 References: <20020613114931.G24721@lyra.org> <003501c2130b$a2bbf470$9e539696@citkwaclaww2k> Message-ID: <20020613120135.K24721@lyra.org> On Thu, Jun 13, 2002 at 02:53:40PM -0400, Karl Waclawek wrote: >... > > The indentation is off here. It looks like your new line uses spaces (good!) > > but the surrounding lines use tabs. > > > > Any opinions on "detabifying" the source code? (that is: convert all tabs to > > spaces, and state that the "style" is no-tabs) > > Yes, I would like spaces only. > > Btw, to be honest, I don't like this "reverse indentation" style > just to make it fit into 80 character lines. Me neither; I didn't know it was present in the Expat sources. Do you have a pointer? IMO, I'd be quite happy to toss anything like that. In fact, a big revamp to make everything consistent would be quite nice. One caution (and I guess this applies to untabifying): if people generate patches against 1.95.3, then we won't be able to apply them to the source code. Thus, it is usually safest to do big revamps right before a release (when the patch queue has been emptied). Cheers, -g -- Greg Stein, http://www.lyra.org/ From karl@waclawek.net Thu Jun 13 14:32:02 2002 From: karl@waclawek.net (Karl Waclawek) Date: Thu Jun 13 13:32:02 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.44,1.45 References: <20020613114931.G24721@lyra.org> <003501c2130b$a2bbf470$9e539696@citkwaclaww2k> <20020613120135.K24721@lyra.org> Message-ID: <000701c21319$3c29d5c0$9e539696@citkwaclaww2k> > On Thu, Jun 13, 2002 at 02:53:40PM -0400, Karl Waclawek wrote: > > Btw, to be honest, I don't like this "reverse indentation" style > > just to make it fit into 80 character lines. > > Me neither; I didn't know it was present in the Expat sources. Do you have a > pointer? I am not sure I have expressed myself understandably. What I mean is: when you read xmlparse.c (especially), indentations seems to go to the left, as the "block nesting level" increases - apparently to stay within a line length of 80. Just open up xmlparse.c and check any of the switch cases in doContent, for example. Follow the indentations - you will see. On the other hand - maybe this is standard C style. As you may have guessed, I am not really a hardcore C/C++ programmer. Here is a snippet: case XML_TOK_EMPTY_ELEMENT_NO_ATTS: if (startElementHandler || endElementHandler) { const char *rawName = s + enc->minBytesPerChar; enum XML_Error result; BINDING *bindings = NULL; TAG_NAME name; name.str = poolStoreString(&tempPool, enc, rawName, rawName + XmlNameLength(enc, rawName)); if (!name.str) return XML_ERROR_NO_MEMORY; poolFinish(&tempPool); result = storeAtts(parser, enc, s, &name, &bindings); if (result) return result; poolFinish(&tempPool); if (startElementHandler) startElementHandler(handlerArg, name.str, (const XML_Char **)atts); if (endElementHandler) { if (startElementHandler) *eventPP = *eventEndPP; endElementHandler(handlerArg, name.str); } poolClear(&tempPool); while (bindings) { BINDING *b = bindings; if (endNamespaceDeclHandler) endNamespaceDeclHandler(handlerArg, b->prefix->name); bindings = bindings->nextTagBinding; b->nextTagBinding = freeBindingList; freeBindingList = b; b->prefix->binding = b->prevPrefixBinding; } } else if (defaultHandler) reportDefault(parser, enc, s, next); if (tagLevel == 0) return epilogProcessor(parser, next, end, nextPtr); break; case XML_TOK_END_TAG: if (tagLevel == startTagLevel) return XML_ERROR_ASYNC_ENTITY; else { int len; const char *rawName; TAG *tag = tagStack; tagStack = tag->parent; tag->parent = freeTagList; freeTagList = tag; rawName = s + enc->minBytesPerChar*2; len = XmlNameLength(enc, rawName); if (len != tag->rawNameLength || memcmp(tag->rawName, rawName, len) != 0) { *eventPP = rawName; return XML_ERROR_TAG_MISMATCH; } --tagLevel; > IMO, I'd be quite happy to toss anything like that. In fact, a big revamp to > make everything consistent would be quite nice. Let's check with Fred. Maybe he likes it the way it is. > One caution (and I guess this applies to untabifying): if people generate > patches against 1.95.3, then we won't be able to apply them to the source > code. Thus, it is usually safest to do big revamps right before a release > (when the patch queue has been emptied). Absolutely. 1.95.4 is coming up soon, it seems. I only have the InternalEntityRefhandler still on my plate, and it is currently being discussed on the mailing list. Karl From fdrake@users.sourceforge.net Thu Jun 13 14:41:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 13:41:01 2002 Subject: [Expat-checkins] htdocs style.css,1.1,1.2 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv18141 Modified Files: style.css Log Message: Added some style for tables in the content area. Index: style.css =================================================================== RCS file: /cvsroot/expat/htdocs/style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- style.css 9 May 2002 12:14:54 -0000 1.1 +++ style.css 13 Jun 2002 20:40:09 -0000 1.2 @@ -11,3 +11,16 @@ } .banner h2 { font-size: 200%; } .content { padding: 2em; } + +.content thead { background-color: rgb(110,139,61); + color: rgb(255,236,176); + } + +.content td, +.content th { padding: .2em; + margin: 0em; + border-width: 0px; + vertical-align: baseline; + border-top: 2px solid rgb(110,139,61); } + +.content tr:first-child td { border-top: 0px; } From fdrake@users.sourceforge.net Thu Jun 13 14:42:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 13 13:42:03 2002 Subject: [Expat-checkins] htdocs/dev index.html,1.3,1.4 trackers.html,1.2,1.3 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv18678 Modified Files: index.html trackers.html Log Message: Add some information about tracker usage, including both recommendations and just useful information that is not always well known, but should be. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html 13 Jun 2002 18:34:14 -0000 1.3 +++ index.html 13 Jun 2002 20:41:24 -0000 1.4 @@ -24,11 +24,9 @@

  • CVS instructions for developers and occasional contributors.
    • -

    This document describes the use of the SourceForge bug & patch -trackers by the Expat maintainers.

    +trackers by the Expat maintainers. These guidelines are substantially +based on the guidelines used for Python.

    -

    Or rather, it will once I find time to write it up.

    +

    Tracker Item Priority

    + +

    The priority field is simple enough; the higher the priority a +report is, the more important it is that the report needs to be +handled. Note that it is the priority of the report relative to other +reports; it does not mean action needs to be taken on the software; +it may be that a report takes a high priority because the bug it +describes is very damaging for someone. Review may, however, +determine that the bug is in someone else's code.

    + +

    So, how should priority be assigned? SourceForge assigns all new +reports a priority of "5", which is considered "normal". The follow +list shows the meanings of each priority level as used by the Expat +project.

    + +
      +
    1. Needs to be solved immediately. We + shouldn't need this since we're volunteers, but it's Ok to use this + if it's assigned to yourself and you have some external reason to + deal with it immediately.
      2. + +
    2. Needs to be dealt with sooner rather than later, and + is before priority "7" reports.
      3. + +
    3. Needs to be handled before release. No release can + be made so long as any report with priority "7" or higher is in any + of the trackers we use.
      4. + +
    4. More important than most reports, but won't cause a + release to be held up.
      5. + +
    5. Most reports. This is how reports are created by + default.
      6. + +
    6. Reports with priority "4" and lower typically wait a + long time to be closed, or they're closed fairly quickly because + they're really easy to close.
      7. +
    + +

    The Status and Resolution Fields

    + +

    In general, the Resolution and Status fields should be close to +self-explanatory, and the "Assigned to:" field should be the person +responsible for taking the next step in the patch process. Both +fields are expected to change value over the life of a patch; the +normal workflow is detailed below.

    + +

    When you've got the time and the ability, feel free to move any +patch that catches your eye along, whether or not it's been assigned +to you. And if you're assigned to a patch but aren't going to take +reasonably quick action (for whatever reason), please assign it to +someone else or unassign it ASAP: at those times you can't actively +help, actively get out of the way.

    + +

    If you're an expert in some area and know that a patch in that area +is both needed and non-controversial, just commit your changes +directly -- no need then to get the patch mechanism involved in +it.

    + +

    The actual patch status is given by the pair of fields called +"Status" and "Resolution":

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    StatusResolutionMeaning
    OpenNoneThe initial state of all patches. + +

    The patch is under consideration, but has not been + reviewed yet, or is under review but not yet Accepted or + Rejected.

    + +

    The Resolution will normally change to Accepted or + Rejected next.

    + +

    The person submitting the report should (if they have + permission) assign it to the person they most want to review + it, else the patch will be assigned based on the judgement + of the reviewer.

    + +

    Discussion of major patches is carried out on the expat-discuss mailing list. For simple patches, the + SourceForge comment mechanism should be sufficient.

    + +

    For the reviewer: If you're certain the patch should be + applied, change the Resolution to Accepted and assign it + back to the submitter for checkin if they are a developer on + the project (if they aren't, the reviewer should commit it + and change Resolution to Accepted and Status to Closed). If + you're certain the patch should never be + accepted, change the Resolution to Rejected, Status to + Closed, and write an explanation in the comment box. If you + have specific complaints that would cause you to change your + mind if addressed, explain them clearly in a comment, leave + the status Open, and reassign back to the submitter (again, + if they're a developer on the project). If you're + uncertain, leave the status Open, explain your uncertainies + in a comment, and reassign the patch to someone you believe + can address your remaining questions; or leave the status + Open and bring it up on expat-discuss.

    OpenAcceptedThe patch has been accepted, but it hasn't been applied + yet. +

    The Status will normally change to Closed next.

    +

    The person changing the Resolution to Accepted should, at the + same time, assign the patch to whoever they believe is most + likely to be able & willing to apply it (the submitter if + possible).

    ClosedAcceptedThe patch has been accepted and applied. +

    The previous Resolution was Accepted or None (if the + reviewer checked it in).

    ClosedRejectedThe patch has been reviewed and rejected. +

    There are generally no transitions out of this state: the + patch is dead.

    OpenOut of datePrevious Resolution was Accepted or Postponed, but the patch + no longer works. +

    Please enter a comment when changing the Resolution to "Out + of date", to record the nature of the problem and the previous + state.

    +

    Also assign it back to the submitter, as they need to upload + a new version.

    OpenPostponedThe previous Resolution was None or Accepted, but for some + reason (e.g., pending release) the patch should not be reviewed + or applied until further notice. +

    The Resolution will normally change to None or Accepted next, + which should be done as soon after the relevant event (release, + etc.) as possible. Checking for Postponed reports should be + part of the release process.

    +

    Please enter a comment when changing the Resolution to + Postponed, to record the reason, the previous Resolution, and + the conditions under which the patch should revert to Resolution + None or Accepted.

    DeletedAnyBit bucket. +

    Use only if it's OK for the patch and its SourceForge history + to disappear. As of 13-June-2002, SourceForge does not actually + throw away Deleted patches, but that may change.

    + +

    SourceForge Tracker Quirks

    + +

    The SourceForge trackers, though quite nice to work with for +moderate sized projects, do have some quirks and limitations. Most of +the funcional limitations are unlikely to affect small projects like +Expat, but the quirky behavior... well, we should be aware of it.

    + +
    +
    Who is "Nobody"?
    +
    That depends on who initially submitted the report. + +

    The most important thing to know is that SourceForge asks + reporters who are not logged in to provide an email address, + but does not require it. There is no way to determine whether + "Nobody" provided one.

    + +

    There are at least two common instances of "Nobody". The + simple interpretation of "Nobody" (and probably the most common + case) is that the reporter did not log into SourceForge and did + not provide an email address. Sometimes a name or email + address will be included in the initial report or a followup; + it is not always the reporters intention to remain anonymous. + If an email address is available this way, it is a good idea to + send an email to the provided address when following up to a + report, allowing the reporter to learn of the response and + provide additional feedback or information.

    + +

    The second common case is that the report was filed by + someone without a SourceForge login or who wanted to remain + anonymous for some reason, but provided an email address to + SourceForge so that they would be automatically notified of any + followup activity. In this case, requests for additional + information in followup comments can actually get results, + sometimes including an email address if the anonymous filing + was not designed to protect anonymity but simply to avoid going + through the SourceForge login screen.

    + +
    + + It's good to know that when filing a report while not logged + in, clicking on the "Please log in!" link beneath the large + text box will take you to a login page that will return you + to your submission form. Contents of the submission form + will be lost, unfortunately, but that link can save a bit of + navigating if you remember it soon enough. + +
    + +

    SourceForge also provides a feature allowing authenticated + users to "monitor" a tracker report. Clicking on the "Monitor" + button will cause SourceForge to send the user an email on each + change to the report in much the way it sends an email to the + current assignee or the address configured in the tracker admin + for new or modified items. (For Expat, this would be the expat-bugs list.) Users who are monitoring a report are + often knowledgable enough to answer questions about whatever the + problem is.

    + +

    So, the "Nobody" listed as the submitter doesn't tell us + much, except that we might not get to know who the submitter + is.

    + +
    +
    +

    View CVS Online

    + + +

    Anonymous CVS Access

    The Expat CVS repository can be checked out through anonymous From fdrake@users.sourceforge.net Thu Jun 27 22:04:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Thu Jun 27 21:04:02 2002 Subject: [Expat-checkins] htdocs index.html,1.23,1.24 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv31279 Modified Files: index.html Log Message: Change CVS link to the local version of the instructions for using the Expat CVS repository. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- index.html 26 Jun 2002 12:54:32 -0000 1.23 +++ index.html 28 Jun 2002 04:03:36 -0000 1.24 @@ -29,7 +29,7 @@ Mailing lists

  • - CVS repository (browse online)
    • From fdrake@users.sourceforge.net Fri Jun 28 07:36:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 28 06:36:03 2002 Subject: [Expat-checkins] expat/tests runtests.c,1.20,1.21 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv6905 Modified Files: runtests.c Log Message: Add a regression test that might tickle SF bug #422239. See comments for more information. Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- runtests.c 22 May 2002 20:22:25 -0000 1.20 +++ runtests.c 28 Jun 2002 13:35:44 -0000 1.21 @@ -262,6 +262,28 @@ } END_TEST +/* Regression test for SF bug #422239 (maybe). + It's not clear that this reproduces enough of the context + of the reported bug. +*/ +START_TEST(test_line_count) +{ + char *text = + "\n" + " \n" + ""; + int lineno; + if (!XML_Parse(parser, text, strlen(text), 1)) + xml_failure(parser); + lineno = XML_GetCurrentLineNumber(parser); + if (lineno != 3) { + char buffer[100]; + sprintf(buffer, "expected 3 lines, saw %d", lineno); + fail(buffer); + } +} +END_TEST + /* * Attribute tests. @@ -495,6 +517,7 @@ tcase_add_test(tc_chars, test_french_charref_decimal); tcase_add_test(tc_chars, test_french_latin1); tcase_add_test(tc_chars, test_french_utf8); + tcase_add_test(tc_chars, test_line_count); suite_add_tcase(s, tc_attrs); tcase_add_checked_fixture(tc_attrs, basic_setup, basic_teardown); From fdrake@users.sourceforge.net Fri Jun 28 07:41:07 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 28 06:41:07 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.7,1.8 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv8245 Modified Files: relreqs-1-95-4.html Log Message: Delayed the InternalEntityRefHandler feature. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- relreqs-1-95-4.html 26 Jun 2002 13:04:04 -0000 1.7 +++ relreqs-1-95-4.html 28 Jun 2002 13:40:20 -0000 1.8 @@ -30,12 +30,6 @@ "http://sourceforge.net/tracker/index.php?func=detail&aid=559910&group_id=10127&atid=310127" >SF patch #559910.
    Status: Done.

    -

  • The InternalEntityRefHandler feature needs to be implemented - and tested.
    - See the comments for SF patch #429501. -

  • SF bug #441449 should be resolved.
    @@ -53,7 +47,18 @@

    Delayed Requirements

    -

    There are no delayed requirements at this time.

    +
      +
    • The InternalEntityRefHandler feature needs to be implemented + and tested.
      + See the comments for SF patch #429501.
      + Status: Delayed: + This was delayed to a future release to allow urgent bugfixes to be + released sooner rather than being delayed by this feature. The + interface for this feature is proving difficult to design, so this + deserves more consideration. +

    Dropped Requirements

    From fdrake@users.sourceforge.net Fri Jun 28 08:21:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 28 07:21:04 2002 Subject: [Expat-checkins] expat/tests runtests.c,1.21,1.22 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv18733 Modified Files: runtests.c Log Message: Add regression tests for SF bug #566334: "Default namespace => wrong element names" Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- runtests.c 28 Jun 2002 13:35:44 -0000 1.21 +++ runtests.c 28 Jun 2002 14:20:07 -0000 1.22 @@ -490,6 +490,85 @@ } END_TEST +static void +overwrite_start_checker(void *userData, const XML_Char *name, + const XML_Char **atts) +{ + CharData *storage = (CharData *) userData; + CharData_AppendString(storage, "start "); + CharData_AppendXMLChars(storage, name, -1); + while (*atts != NULL) { + CharData_AppendString(storage, "\nattribute "); + CharData_AppendXMLChars(storage, *atts, -1); + atts += 2; + } + CharData_AppendString(storage, "\n"); +} + +static void +overwrite_end_checker(void *userData, const XML_Char *name) +{ + CharData *storage = (CharData *) userData; + CharData_AppendString(storage, "end "); + CharData_AppendXMLChars(storage, name, -1); + CharData_AppendString(storage, "\n"); +} + +static void +run_ns_tagname_overwrite_test(char *text, char *result) +{ + CharData storage; + CharData_Init(&storage); + XML_SetUserData(parser, &storage); + XML_SetElementHandler(parser, + overwrite_start_checker, overwrite_end_checker); + if (!XML_Parse(parser, text, strlen(text), 1)) + xml_failure(parser); + CharData_CheckString(&storage, result); +} + +/* Regression test for SF bug #566334. */ +START_TEST(test_ns_tagname_overwrite) +{ + char *text = + "\n" + " \n" + " \n" + ""; + char *result = + "start http://xml.libexpat.org/ e\n" + "start http://xml.libexpat.org/ f\n" + "attribute http://xml.libexpat.org/ attr\n" + "end http://xml.libexpat.org/ f\n" + "start http://xml.libexpat.org/ g\n" + "attribute http://xml.libexpat.org/ attr2\n" + "end http://xml.libexpat.org/ g\n" + "end http://xml.libexpat.org/ e\n"; + run_ns_tagname_overwrite_test(text, result); +} +END_TEST + +/* Regression test for SF bug #566334. */ +START_TEST(test_ns_tagname_overwrite_triplet) +{ + char *text = + "\n" + " \n" + " \n" + ""; + char *result = + "start http://xml.libexpat.org/ e n\n" + "start http://xml.libexpat.org/ f n\n" + "attribute http://xml.libexpat.org/ attr n\n" + "end http://xml.libexpat.org/ f n\n" + "start http://xml.libexpat.org/ g n\n" + "attribute http://xml.libexpat.org/ attr2 n\n" + "end http://xml.libexpat.org/ g n\n" + "end http://xml.libexpat.org/ e n\n"; + XML_SetReturnNSTriplet(parser, 1); + run_ns_tagname_overwrite_test(text, result); +} +END_TEST static Suite * make_basic_suite(void) @@ -531,6 +610,8 @@ tcase_add_checked_fixture(tc_namespace, namespace_setup, namespace_teardown); tcase_add_test(tc_namespace, test_return_ns_triplet); + tcase_add_test(tc_namespace, test_ns_tagname_overwrite); + tcase_add_test(tc_namespace, test_ns_tagname_overwrite_triplet); return s; } From fdrake@users.sourceforge.net Fri Jun 28 17:05:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 28 16:05:04 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.45,1.46 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv2069/lib Modified Files: xmlparse.c Log Message: Fix SF bug #575168: "Missing events for end-element". Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- xmlparse.c 13 Jun 2002 12:52:39 -0000 1.45 +++ xmlparse.c 28 Jun 2002 23:04:49 -0000 1.46 @@ -1766,7 +1766,7 @@ tag->rawName = tag->buf; } ++tagLevel; - if (startElementHandler) { + if (startElementHandler || endElementHandler) { enum XML_Error result; XML_Char *toPtr; for (;;) { @@ -1799,8 +1799,9 @@ result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings)); if (result) return result; - startElementHandler(handlerArg, tag->name.str, - (const XML_Char **)atts); + if (startElementHandler) + startElementHandler(handlerArg, tag->name.str, + (const XML_Char **)atts); poolClear(&tempPool); } else { From fdrake@users.sourceforge.net Fri Jun 28 17:05:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Fri Jun 28 16:05:04 2002 Subject: [Expat-checkins] expat/tests runtests.c,1.22,1.23 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv2069/tests Modified Files: runtests.c Log Message: Fix SF bug #575168: "Missing events for end-element". Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- runtests.c 28 Jun 2002 14:20:07 -0000 1.22 +++ runtests.c 28 Jun 2002 23:04:49 -0000 1.23 @@ -286,6 +286,34 @@ /* + * Element event tests. + */ + +static void +end_element_event_handler(void *userData, const XML_Char *name) +{ + CharData *storage = (CharData *) userData; + CharData_AppendString(storage, "/"); + CharData_AppendXMLChars(storage, name, -1); +} + +START_TEST(test_end_element_events) +{ + char *text = ""; + char *expected = "/c/b/f/d/a"; + CharData storage; + + CharData_Init(&storage); + XML_SetUserData(parser, &storage); + XML_SetEndElementHandler(parser, end_element_event_handler); + if (!XML_Parse(parser, text, strlen(text), 1)) + xml_failure(parser); + CharData_CheckString(&storage, expected); +} +END_TEST + + +/* * Attribute tests. */ @@ -578,6 +606,7 @@ TCase *tc_attrs = tcase_create("attributes"); TCase *tc_xmldecl = tcase_create("XML declaration"); TCase *tc_namespace = tcase_create("XML namespaces"); + TCase *tc_elements = tcase_create("element events"); suite_add_tcase(s, tc_chars); tcase_add_checked_fixture(tc_chars, basic_setup, basic_teardown); @@ -597,6 +626,10 @@ tcase_add_test(tc_chars, test_french_latin1); tcase_add_test(tc_chars, test_french_utf8); tcase_add_test(tc_chars, test_line_count); + + suite_add_tcase(s, tc_elements); + tcase_add_checked_fixture(tc_elements, basic_setup, basic_teardown); + tcase_add_test(tc_elements, test_end_element_events); suite_add_tcase(s, tc_attrs); tcase_add_checked_fixture(tc_attrs, basic_setup, basic_teardown); From fdrake@users.sourceforge.net Sat Jun 29 09:25:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Sat Jun 29 08:25:02 2002 Subject: [Expat-checkins] expat expat.spec,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv10942 Modified Files: expat.spec Log Message: Update for the 1.95.4 release. Index: expat.spec =================================================================== RCS file: /cvsroot/expat/expat/expat.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- expat.spec 3 Jun 2002 19:38:13 -0000 1.6 +++ expat.spec 29 Jun 2002 15:24:30 -0000 1.7 @@ -1,4 +1,4 @@ -%define version 1.95.3 +%define version 1.95.4 %define release 1 Summary: Expat is an XML 1.0 parser written in C. @@ -38,6 +38,10 @@ /usr/man/man1/xmlwf.1.gz %changelog +* Sat Jun 29 2002 Fred L. Drake, Jr. +[Release 1.95.4-1] +- Updated for the 1.95.4 release. + * Fri May 17 2002 Fred L. Drake, Jr. [Release 1.95.3-1] - Updated for the 1.95.3 release. From fdrake@users.sourceforge.net Sat Jun 29 09:27:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Sat Jun 29 08:27:04 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.8,1.9 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv13436 Modified Files: relreqs-1-95-4.html Log Message: Delay the Unix build-process changes since we really need to get a bugfix release out. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- relreqs-1-95-4.html 28 Jun 2002 13:40:20 -0000 1.8 +++ relreqs-1-95-4.html 29 Jun 2002 15:26:38 -0000 1.9 @@ -35,9 +35,6 @@ >SF bug #441449 should be resolved.
    Status: Done.

    -

  • The build process on Unix should create both libexpat.{a,so} - and libexpatw.{a,so} by default. -

  • Hard tab characters will be removed from all source files. They will be replaced with spaces.
    See +
  • The build process on Unix should create both libexpat.{a,so} + and libexpatw.{a,so} by default. + Status: Delayed: + Delayed since we don't want the build process changes to hold up + the release of real bug fixes. We can have another release later.

    Dropped Requirements