From fdrake at users.sourceforge.net  Sun Nov  2 03:12:49 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 03:12:52 2003
Subject: [Expat-checkins] expat/tests runtests.c,1.54,1.55
Message-ID: <E1AGDLt-00068f-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv23590

Modified Files:
	runtests.c 
Log Message:
added regression test for SF bug #824420:
in non-namespace mode, Expat reported the use of an unbound namespace
when encountering an element that looks like it has a namespace prefix
(were namespaces enabled) and there's a definition for that prefix in
the DTD


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- runtests.c	16 Oct 2003 04:51:11 -0000	1.54
+++ runtests.c	2 Nov 2003 08:12:46 -0000	1.55
@@ -952,6 +952,24 @@
 }
 END_TEST
 
+/* Regression test for SF bug #824420.
+   Checks that an xmlns:prefix attribute set in an attribute's default
+   value isn't misinterpreted.
+*/
+START_TEST(test_ns_in_attribute_default_without_namespaces)
+{
+    char *text =
+        "<!DOCTYPE e:element [\n"
+        "  <!ATTLIST e:element\n"
+        "    xmlns:e CDATA 'http://example.com/'>\n"
+        "      ]>\n"
+        "<e:element/>";
+
+    if (XML_Parse(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)
+        xml_failure(parser);
+}
+END_TEST
+
 
 /*
  * Namespaces tests.
@@ -1349,6 +1367,7 @@
     tcase_add_test(tc_basic, test_ext_entity_set_encoding);
     tcase_add_test(tc_basic, test_dtd_default_handling);
     tcase_add_test(tc_basic, test_empty_ns_without_namespaces);
+    tcase_add_test(tc_basic, test_ns_in_attribute_default_without_namespaces);
 
     suite_add_tcase(s, tc_namespace);
     tcase_add_checked_fixture(tc_namespace,



From fdrake at users.sourceforge.net  Sun Nov  2 03:21:32 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 03:21:35 2003
Subject: [Expat-checkins] expat Makefile.in,1.43,1.44
Message-ID: <E1AGDUK-0006QH-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1:/tmp/cvs-serv24662

Modified Files:
	Makefile.in 
Log Message:
Allow the configure script to set where manpages go using --mandir.
Closes SF bug #827319.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.in	16 Oct 2003 04:51:11 -0000	1.43
+++ Makefile.in	2 Nov 2003 08:21:30 -0000	1.44
@@ -30,7 +30,7 @@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
-mandir = ${prefix}/man/man1
+man1dir = @mandir@/man1
 
 top_builddir = .
 
@@ -73,9 +73,9 @@
 	tests/runtests
 
 install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(bindir) $(mandir)
+	$(mkinstalldirs) $(bindir) $(man1dir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-	$(INSTALL_DATA) $(MANFILE) $(mandir)
+	$(INSTALL_DATA) $(MANFILE) $(man1dir)
 
 installlib: $(LIBRARY) $(APIHEADER)
 	$(mkinstalldirs) $(libdir) $(includedir)
@@ -84,7 +84,7 @@
 
 uninstall: uninstalllib
 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-	rm -f $(mandir)/xmlwf.1
+	rm -f $(man1dir)/xmlwf.1
 
 uninstalllib:
 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)



From fdrake at users.sourceforge.net  Sun Nov  2 04:44:57 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 04:45:02 2003
Subject: [Expat-checkins] expat/lib xmlparse.c,1.119,1.120
Message-ID: <E1AGEn3-0000Yr-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv2150/lib

Modified Files:
	xmlparse.c 
Log Message:
Simplify preprocessor construct.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- xmlparse.c	30 Oct 2003 14:58:39 -0000	1.119
+++ xmlparse.c	2 Nov 2003 09:44:55 -0000	1.120
@@ -11,10 +11,8 @@
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
-#else
-#ifdef HAVE_EXPAT_CONFIG_H
+#elif defined(HAVE_EXPAT_CONFIG_H)
 #include <expat_config.h>
-#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "expat.h"



From fdrake at users.sourceforge.net  Sun Nov  2 13:13:36 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 13:13:39 2003
Subject: [Expat-checkins] expat/vms expat_config.h,1.1,1.2
Message-ID: <E1AGMjI-0005q5-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/vms
In directory sc8-pr-cvs1:/tmp/cvs-serv22437

Modified Files:
	expat_config.h 
Log Message:
remove unused stanzas


Index: expat_config.h
===================================================================
RCS file: /cvsroot/expat/expat/vms/expat_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat_config.h	5 Jun 2002 04:13:10 -0000	1.1
+++ expat_config.h	2 Nov 2003 18:13:34 -0000	1.2
@@ -18,9 +18,6 @@
 /* Define to `unsigned' if <sys/types.h> 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
@@ -28,14 +25,8 @@
 /* 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 <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1



From fdrake at users.sourceforge.net  Sun Nov  2 13:14:13 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 13:14:17 2003
Subject: [Expat-checkins] expat/lib macconfig.h,1.1,1.2
Message-ID: <E1AGMjt-0005sZ-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv22594

Modified Files:
	macconfig.h 
Log Message:
remove unused stanzas


Index: macconfig.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/macconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- macconfig.h	8 Jul 2002 17:06:55 -0000	1.1
+++ macconfig.h	2 Nov 2003 18:14:11 -0000	1.2
@@ -18,65 +18,14 @@
 /* Define to 1 if you have the `bcopy' function. */
 #undef HAVE_BCOPY
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS
 
 /* whether byteorder is bigendian */
 #define WORDS_BIGENDIAN



From fdrake at users.sourceforge.net  Sun Nov  2 15:37:24 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sun Nov  2 15:37:28 2003
Subject: [Expat-checkins] expat/lib expat.h,1.57,1.58
Message-ID: <E1AGOyS-0005BZ-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv19932/lib

Modified Files:
	expat.h 
Log Message:
bump the version number since the code has changed, however slightly

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- expat.h	16 Oct 2003 04:20:54 -0000	1.57
+++ expat.h	2 Nov 2003 20:37:22 -0000	1.58
@@ -992,7 +992,7 @@
 */
 #define XML_MAJOR_VERSION 1
 #define XML_MINOR_VERSION 95
-#define XML_MICRO_VERSION 7
+#define XML_MICRO_VERSION 8
 
 #ifdef __cplusplus
 }



From fdrake at users.sourceforge.net  Mon Nov 17 10:36:05 2003
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Mon Nov 17 10:36:18 2003
Subject: [Expat-checkins] expat/vms descrip.mms,1.2,1.3
Message-ID: <E1ALlQ5-0007xW-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/vms
In directory sc8-pr-cvs1:/tmp/cvs-serv30551

Modified Files:
	descrip.mms 
Log Message:
Defined HAVE_EXPAT_CONFIG_H when building on VMS.
Closes SF bug #840173.


Index: descrip.mms
===================================================================
RCS file: /cvsroot/expat/expat/vms/descrip.mms,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- descrip.mms	16 Jul 2003 12:21:25 -0000	1.2
+++ descrip.mms	17 Nov 2003 15:36:02 -0000	1.3
@@ -22,7 +22,7 @@
  
 CONFIG_HEADER = expat_config.h
 INCLUDES = /INCLUDE=([],[.lib])
-DEFS = /DEFINE=(PACKAGE="""$(PACKAGE)""",VERSION="""$(PACKAGE)_$(VERSION)""")
+DEFS = /DEFINE=(PACKAGE="""$(PACKAGE)""",VERSION="""$(PACKAGE)_$(VERSION)""",HAVE_EXPAT_CONFIG_H)
 LIBREVISION = 0
 LIBCURRENT  = 1
 LIBAGE      = 0