c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

releasing 2.4.9 fixing catalog breakages fixed more problems in catalog

Browse Source 
* configure.in include/libxml/xmlwin32version.h: releasing 2.4.9
  fixing catalog breakages
* Makefile.am catalog.c result/catalogs/catal
  result/catalogs/mycatalog.* test/catalogs/catal*:
  fixed more problems in catalog support, added more regression tests
  for both XML and SGML catalog handling
Daniel
This commit is contained in:
Daniel Veillard 2001-11-06 15:24:37 +00:00
parent 66870c7182
commit c853b32f9d
13 changed files with 147 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Nov 6 16:21:33 CET 2001 Daniel Veillard <daniel@veillard.com>
* configure.in include/libxml/xmlwin32version.h: releasing 2.4.9
fixing catalog breakages
* Makefile.am catalog.c result/catalogs/catal
result/catalogs/mycatalog.* test/catalogs/catal*:
fixed more problems in catalog support, added more regression tests
for both XML and SGML catalog handling
Mon Nov 5 20:26:41 CET 2001 Daniel Veillard <daniel@veillard.com> Mon Nov 5 20:26:41 CET 2001 Daniel Veillard <daniel@veillard.com>
* debugXML.c: applied an improvement to xmlGetLineNo() from * debugXML.c: applied an improvement to xmlGetLineNo() from

34
Makefile.am
View File

@ -419,6 +419,40 @@ Catatests : xmlcatalog
diff $(srcdir)/result/catalogs/$$name result.$$name ; \ diff $(srcdir)/result/catalogs/$$name result.$$name ; \
rm result.$$name ; \ rm result.$$name ; \
fi ; fi ; done) fi ; fi ; done)
@(for i in $(srcdir)/test/catalogs/*.script ; do \
name=`basename $$i .script`; \
sgml=$(srcdir)/test/catalogs/`basename $$i .script`.sgml; \
if [ -f $$sgml ] ; then \
if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \
echo New test file $$name ; \
$(top_builddir)/xmlcatalog --shell $$sgml < $$i > $(srcdir)/result/catalogs/$$name ; \
else \
echo Testing $$name ; \
$(top_builddir)/xmlcatalog --shell $$sgml < $$i > result.$$name ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
diff $(srcdir)/result/catalogs/$$name result.$$name ; \
rm result.$$name ; \
fi ; fi ; done)
@echo "Add and del operations on XML Catalogs"
@(xmlcatalog --create --noout result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid sysid result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid2 sysid2 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid3 sysid3 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff result/catalogs/mycatalog.full result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid3 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid2 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff result/catalogs/mycatalog.empty result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
rm -f result/catalogs/mycatalog)
SVGtests : xmllint SVGtests : xmllint
@echo "##" @echo "##"

114
catalog.c
View File

@ -70,6 +70,7 @@ static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
************************************************************************/ ************************************************************************/
typedef enum { typedef enum {
XML_CATA_REMOVED = -1,
XML_CATA_NONE = 0, XML_CATA_NONE = 0,
XML_CATA_CATALOG, XML_CATA_CATALOG,
XML_CATA_BROKEN_CATALOG, XML_CATA_BROKEN_CATALOG,
@ -105,6 +106,7 @@ struct _xmlCatalogEntry {
xmlCatalogEntryType type; xmlCatalogEntryType type;
xmlChar *name; xmlChar *name;
xmlChar *value; xmlChar *value;
xmlChar *URL; /* The expanded URL using the base */
xmlCatalogPrefer prefer; xmlCatalogPrefer prefer;
int dealloc; int dealloc;
}; };
@ -193,7 +195,7 @@ static int xmlCatalogInitialized = 0;
*/ */
static xmlCatalogEntryPtr static xmlCatalogEntryPtr
xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name, xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name,
const xmlChar *value, xmlCatalogPrefer prefer) { const xmlChar *value, const xmlChar *URL, xmlCatalogPrefer prefer) {
xmlCatalogEntryPtr ret; xmlCatalogEntryPtr ret;
ret = (xmlCatalogEntryPtr) xmlMalloc(sizeof(xmlCatalogEntry)); ret = (xmlCatalogEntryPtr) xmlMalloc(sizeof(xmlCatalogEntry));
@ -214,6 +216,12 @@ xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name,
ret->value = xmlStrdup(value); ret->value = xmlStrdup(value);
else else
ret->value = NULL; ret->value = NULL;
if (URL == NULL)
URL = value;
if (URL != NULL)
ret->URL = xmlStrdup(URL);
else
ret->URL = NULL;
ret->prefer = prefer; ret->prefer = prefer;
ret->dealloc = 0; ret->dealloc = 0;
return(ret); return(ret);
@ -255,6 +263,8 @@ xmlFreeCatalogEntry(xmlCatalogEntryPtr ret) {
xmlFree(ret->name); xmlFree(ret->name);
if (ret->value != NULL) if (ret->value != NULL)
xmlFree(ret->value); xmlFree(ret->value);
if (ret->URL != NULL)
xmlFree(ret->URL);
xmlFree(ret); xmlFree(ret);
} }
@ -470,6 +480,8 @@ BAD_CAST "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd");
cur = catal; cur = catal;
while (cur != NULL) { while (cur != NULL) {
switch (cur->type) { switch (cur->type) {
case XML_CATA_REMOVED:
break;
case XML_CATA_BROKEN_CATALOG: case XML_CATA_BROKEN_CATALOG:
case XML_CATA_CATALOG: case XML_CATA_CATALOG:
if (cur == catal) { if (cur == catal) {
@ -983,7 +995,7 @@ xmlParseXMLCatalogOneNode(xmlNodePtr cur, xmlCatalogEntryType type,
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Found %s: '%s'\n", name, URL); "Found %s: '%s'\n", name, URL);
} }
ret = xmlNewCatalogEntry(type, nameValue, URL, prefer); ret = xmlNewCatalogEntry(type, nameValue, uriValue, URL, prefer);
} else { } else {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%s entry '%s' broken ?: %s\n", name, uriAttrName, uriValue); "%s entry '%s' broken ?: %s\n", name, uriAttrName, uriValue);
@ -1157,7 +1169,7 @@ xmlParseXMLCatalogFile(xmlCatalogPrefer prefer, const xmlChar *filename) {
(xmlStrEqual(cur->ns->href, XML_CATALOGS_NAMESPACE))) { (xmlStrEqual(cur->ns->href, XML_CATALOGS_NAMESPACE))) {
parent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, parent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
(const xmlChar *)filename, prefer); (const xmlChar *)filename, NULL, prefer);
if (parent == NULL) { if (parent == NULL) {
xmlFreeDoc(doc); xmlFreeDoc(doc);
return(NULL); return(NULL);
@ -1202,7 +1214,7 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
if (catal == NULL) if (catal == NULL)
return(-1); return(-1);
if (catal->value == NULL) if (catal->URL == NULL)
return(-1); return(-1);
if (catal->children != NULL) if (catal->children != NULL)
return(-1); return(-1);
@ -1219,11 +1231,11 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
if (xmlCatalogXMLFiles != NULL) { if (xmlCatalogXMLFiles != NULL) {
doc = (xmlCatalogEntryPtr) doc = (xmlCatalogEntryPtr)
xmlHashLookup(xmlCatalogXMLFiles, catal->value); xmlHashLookup(xmlCatalogXMLFiles, catal->URL);
if (doc != NULL) { if (doc != NULL) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Found %s in file hash\n", catal->value); "Found %s in file hash\n", catal->URL);
if (catal->type == XML_CATA_CATALOG) if (catal->type == XML_CATA_CATALOG)
catal->children = doc->children; catal->children = doc->children;
@ -1235,7 +1247,7 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
} }
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%s not found in file hash\n", catal->value); "%s not found in file hash\n", catal->URL);
} }
/* /*
@ -1243,7 +1255,7 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
* use the existing catalog, there is no recusivity allowed at * use the existing catalog, there is no recusivity allowed at
* that level. * that level.
*/ */
doc = xmlParseXMLCatalogFile(catal->prefer, catal->value); doc = xmlParseXMLCatalogFile(catal->prefer, catal->URL);
if (doc == NULL) { if (doc == NULL) {
catal->type = XML_CATA_BROKEN_CATALOG; catal->type = XML_CATA_BROKEN_CATALOG;
xmlRMutexUnlock(xmlCatalogMutex); xmlRMutexUnlock(xmlCatalogMutex);
@ -1262,8 +1274,8 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
if (xmlCatalogXMLFiles != NULL) { if (xmlCatalogXMLFiles != NULL) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%s added to file hash\n", catal->value); "%s added to file hash\n", catal->URL);
xmlHashAddEntry(xmlCatalogXMLFiles, catal->value, doc); xmlHashAddEntry(xmlCatalogXMLFiles, catal->URL, doc);
} }
xmlRMutexUnlock(xmlCatalogMutex); xmlRMutexUnlock(xmlCatalogMutex);
return(0); return(0);
@ -1292,6 +1304,7 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
const xmlChar *orig, const xmlChar *replace) { const xmlChar *orig, const xmlChar *replace) {
xmlCatalogEntryPtr cur; xmlCatalogEntryPtr cur;
xmlCatalogEntryType typ; xmlCatalogEntryType typ;
int doregister = 0;
if ((catal == NULL) || if ((catal == NULL) ||
((catal->type != XML_CATA_CATALOG) && ((catal->type != XML_CATA_CATALOG) &&
@ -1300,6 +1313,9 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
if (catal->children == NULL) { if (catal->children == NULL) {
xmlFetchXMLCatalogFile(catal); xmlFetchXMLCatalogFile(catal);
} }
if (catal->children == NULL)
doregister = 1;
typ = xmlGetXMLCatalogEntryType(type); typ = xmlGetXMLCatalogEntryType(type);
if (typ == XML_CATA_NONE) { if (typ == XML_CATA_NONE) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
@ -1321,7 +1337,10 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
"Updating element %s to catalog\n", type); "Updating element %s to catalog\n", type);
if (cur->value != NULL) if (cur->value != NULL)
xmlFree(cur->value); xmlFree(cur->value);
if (cur->URL != NULL)
xmlFree(cur->URL);
cur->value = xmlStrdup(replace); cur->value = xmlStrdup(replace);
cur->URL = xmlStrdup(replace);
return(0); return(0);
} }
if (cur->next == NULL) if (cur->next == NULL)
@ -1333,9 +1352,17 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Adding element %s to catalog\n", type); "Adding element %s to catalog\n", type);
if (cur == NULL) if (cur == NULL)
catal->children = xmlNewCatalogEntry(typ, orig, replace, catal->prefer); catal->children = xmlNewCatalogEntry(typ, orig, replace,
NULL, catal->prefer);
else else
cur->next = xmlNewCatalogEntry(typ, orig, replace, catal->prefer); cur->next = xmlNewCatalogEntry(typ, orig, replace,
NULL, catal->prefer);
if (doregister) {
cur = xmlHashLookup(xmlCatalogXMLFiles, catal->URL);
if (cur != NULL)
cur->children = catal->children;
}
return(0); return(0);
} }
@ -1351,7 +1378,7 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
*/ */
static int static int
xmlDelXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *value) { xmlDelXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *value) {
xmlCatalogEntryPtr cur, prev, tmp; xmlCatalogEntryPtr cur;
int ret = 0; int ret = 0;
if ((catal == NULL) || if ((catal == NULL) ||
@ -1368,7 +1395,6 @@ xmlDelXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *value) {
* Scan the children * Scan the children
*/ */
cur = catal->children; cur = catal->children;
prev = NULL;
while (cur != NULL) { while (cur != NULL) {
if (((cur->name != NULL) && (xmlStrEqual(value, cur->name))) || if (((cur->name != NULL) && (xmlStrEqual(value, cur->name))) ||
(xmlStrEqual(value, cur->value))) { (xmlStrEqual(value, cur->value))) {
@ -1380,18 +1406,8 @@ xmlDelXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *value) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Removing element %s from catalog\n", cur->value); "Removing element %s from catalog\n", cur->value);
} }
ret++; cur->type = XML_CATA_REMOVED;
tmp = cur;
cur = tmp->next;
if (prev == NULL) {
catal->children = cur;
} else {
prev->next = cur;
}
xmlFreeCatalogEntry(tmp);
continue;
} }
prev = cur;
cur = cur->next; cur = cur->next;
} }
return(ret); return(ret);
@ -1434,7 +1450,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Found system match %s\n", cur->name); "Found system match %s\n", cur->name);
return(xmlStrdup(cur->value)); return(xmlStrdup(cur->URL));
} }
break; break;
case XML_CATA_REWRITE_SYSTEM: case XML_CATA_REWRITE_SYSTEM:
@ -1461,7 +1477,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Using rewriting rule %s\n", rewrite->name); "Using rewriting rule %s\n", rewrite->name);
ret = xmlStrdup(rewrite->value); ret = xmlStrdup(rewrite->URL);
if (ret != NULL) if (ret != NULL)
ret = xmlStrcat(ret, &sysID[lenrewrite]); ret = xmlStrcat(ret, &sysID[lenrewrite]);
return(ret); return(ret);
@ -1479,14 +1495,14 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if ((cur->type == XML_CATA_DELEGATE_SYSTEM) && if ((cur->type == XML_CATA_DELEGATE_SYSTEM) &&
(!xmlStrncmp(sysID, cur->name, xmlStrlen(cur->name)))) { (!xmlStrncmp(sysID, cur->name, xmlStrlen(cur->name)))) {
for (i = 0;i < nbList;i++) for (i = 0;i < nbList;i++)
if (xmlStrEqual(cur->value, delegates[i])) if (xmlStrEqual(cur->URL, delegates[i]))
break; break;
if (i < nbList) { if (i < nbList) {
cur = cur->next; cur = cur->next;
continue; continue;
} }
if (nbList < MAX_DELEGATE) if (nbList < MAX_DELEGATE)
delegates[nbList++] = cur->value; delegates[nbList++] = cur->URL;
if (cur->children == NULL) { if (cur->children == NULL) {
xmlFetchXMLCatalogFile(cur); xmlFetchXMLCatalogFile(cur);
@ -1494,7 +1510,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (cur->children != NULL) { if (cur->children != NULL) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Trying system delegate %s\n", cur->value); "Trying system delegate %s\n", cur->URL);
ret = xmlCatalogListXMLResolve( ret = xmlCatalogListXMLResolve(
cur->children, NULL, sysID); cur->children, NULL, sysID);
if (ret != NULL) if (ret != NULL)
@ -1522,7 +1538,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Found public match %s\n", cur->name); "Found public match %s\n", cur->name);
return(xmlStrdup(cur->value)); return(xmlStrdup(cur->URL));
} }
break; break;
case XML_CATA_DELEGATE_PUBLIC: case XML_CATA_DELEGATE_PUBLIC:
@ -1554,14 +1570,14 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
(!xmlStrncmp(pubID, cur->name, xmlStrlen(cur->name)))) { (!xmlStrncmp(pubID, cur->name, xmlStrlen(cur->name)))) {
for (i = 0;i < nbList;i++) for (i = 0;i < nbList;i++)
if (xmlStrEqual(cur->value, delegates[i])) if (xmlStrEqual(cur->URL, delegates[i]))
break; break;
if (i < nbList) { if (i < nbList) {
cur = cur->next; cur = cur->next;
continue; continue;
} }
if (nbList < MAX_DELEGATE) if (nbList < MAX_DELEGATE)
delegates[nbList++] = cur->value; delegates[nbList++] = cur->URL;
if (cur->children == NULL) { if (cur->children == NULL) {
xmlFetchXMLCatalogFile(cur); xmlFetchXMLCatalogFile(cur);
@ -1569,7 +1585,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (cur->children != NULL) { if (cur->children != NULL) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Trying public delegate %s\n", cur->value); "Trying public delegate %s\n", cur->URL);
ret = xmlCatalogListXMLResolve( ret = xmlCatalogListXMLResolve(
cur->children, pubID, NULL); cur->children, pubID, NULL);
if (ret != NULL) if (ret != NULL)
@ -1645,7 +1661,7 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Found URI match %s\n", cur->name); "Found URI match %s\n", cur->name);
return(xmlStrdup(cur->value)); return(xmlStrdup(cur->URL));
} }
break; break;
case XML_CATA_REWRITE_URI: case XML_CATA_REWRITE_URI:
@ -1672,7 +1688,7 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Using rewriting rule %s\n", rewrite->name); "Using rewriting rule %s\n", rewrite->name);
ret = xmlStrdup(rewrite->value); ret = xmlStrdup(rewrite->URL);
if (ret != NULL) if (ret != NULL)
ret = xmlStrcat(ret, &URI[lenrewrite]); ret = xmlStrcat(ret, &URI[lenrewrite]);
return(ret); return(ret);
@ -1690,14 +1706,14 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
if ((cur->type == XML_CATA_DELEGATE_SYSTEM) && if ((cur->type == XML_CATA_DELEGATE_SYSTEM) &&
(!xmlStrncmp(URI, cur->name, xmlStrlen(cur->name)))) { (!xmlStrncmp(URI, cur->name, xmlStrlen(cur->name)))) {
for (i = 0;i < nbList;i++) for (i = 0;i < nbList;i++)
if (xmlStrEqual(cur->value, delegates[i])) if (xmlStrEqual(cur->URL, delegates[i]))
break; break;
if (i < nbList) { if (i < nbList) {
cur = cur->next; cur = cur->next;
continue; continue;
} }
if (nbList < MAX_DELEGATE) if (nbList < MAX_DELEGATE)
delegates[nbList++] = cur->value; delegates[nbList++] = cur->URL;
if (cur->children == NULL) { if (cur->children == NULL) {
xmlFetchXMLCatalogFile(cur); xmlFetchXMLCatalogFile(cur);
@ -1705,7 +1721,7 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
if (cur->children != NULL) { if (cur->children != NULL) {
if (xmlDebugCatalogs) if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Trying URI delegate %s\n", cur->value); "Trying URI delegate %s\n", cur->URL);
ret = xmlCatalogListXMLResolveURI( ret = xmlCatalogListXMLResolveURI(
cur->children, URI); cur->children, URI);
if (ret != NULL) if (ret != NULL)
@ -2209,7 +2225,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
xmlCatalogEntryPtr entry; xmlCatalogEntryPtr entry;
entry = xmlNewCatalogEntry(type, name, filename, entry = xmlNewCatalogEntry(type, name, filename,
XML_CATA_PREFER_NONE); NULL, XML_CATA_PREFER_NONE);
res = xmlHashAddEntry(catal->sgml, name, entry); res = xmlHashAddEntry(catal->sgml, name, entry);
if (res < 0) { if (res < 0) {
xmlFreeCatalogEntry(entry); xmlFreeCatalogEntry(entry);
@ -2221,7 +2237,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
if (super) { if (super) {
xmlCatalogEntryPtr entry; xmlCatalogEntryPtr entry;
entry = xmlNewCatalogEntry(type, sysid, NULL, entry = xmlNewCatalogEntry(type, sysid, NULL, NULL,
XML_CATA_PREFER_NONE); XML_CATA_PREFER_NONE);
res = xmlHashAddEntry(catal->sgml, sysid, entry); res = xmlHashAddEntry(catal->sgml, sysid, entry);
if (res < 0) { if (res < 0) {
@ -2279,7 +2295,7 @@ xmlCatalogGetSGMLPublic(xmlHashTablePtr catal, const xmlChar *pubID) {
if (entry == NULL) if (entry == NULL)
return(NULL); return(NULL);
if (entry->type == SGML_CATA_PUBLIC) if (entry->type == SGML_CATA_PUBLIC)
return(entry->value); return(entry->URL);
return(NULL); return(NULL);
} }
@ -2303,7 +2319,7 @@ xmlCatalogGetSGMLSystem(xmlHashTablePtr catal, const xmlChar *sysID) {
if (entry == NULL) if (entry == NULL)
return(NULL); return(NULL);
if (entry->type == SGML_CATA_SYSTEM) if (entry->type == SGML_CATA_SYSTEM)
return(entry->value); return(entry->URL);
return(NULL); return(NULL);
} }
@ -2425,7 +2441,7 @@ xmlLoadACatalog(const char *filename)
xmlFree(content); xmlFree(content);
return(NULL); return(NULL);
} }
catal->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, catal->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
NULL, BAD_CAST filename, xmlCatalogDefaultPrefer); NULL, BAD_CAST filename, xmlCatalogDefaultPrefer);
} }
xmlFree(content); xmlFree(content);
@ -2466,7 +2482,7 @@ xmlExpandCatalog(xmlCatalogPtr catal, const char *filename)
xmlFree(content); xmlFree(content);
} else { } else {
xmlCatalogEntryPtr tmp, cur; xmlCatalogEntryPtr tmp, cur;
tmp = xmlNewCatalogEntry(XML_CATA_CATALOG, tmp = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
NULL, BAD_CAST filename, xmlCatalogDefaultPrefer); NULL, BAD_CAST filename, xmlCatalogDefaultPrefer);
cur = catal->xml; cur = catal->xml;
@ -2679,7 +2695,7 @@ xmlACatalogAdd(xmlCatalogPtr catal, const xmlChar * type,
if (cattype != XML_CATA_NONE) { if (cattype != XML_CATA_NONE) {
xmlCatalogEntryPtr entry; xmlCatalogEntryPtr entry;
entry = xmlNewCatalogEntry(cattype, orig, replace, entry = xmlNewCatalogEntry(cattype, orig, replace, NULL,
XML_CATA_PREFER_NONE); XML_CATA_PREFER_NONE);
if (catal->sgml == NULL) if (catal->sgml == NULL)
catal->sgml = xmlHashCreate(10); catal->sgml = xmlHashCreate(10);
@ -2829,7 +2845,7 @@ xmlInitializeCatalog(void) {
catal = xmlCreateNewCatalog(XML_XML_CATALOG_TYPE, xmlCatalogDefaultPrefer); catal = xmlCreateNewCatalog(XML_XML_CATALOG_TYPE, xmlCatalogDefaultPrefer);
if (catal != NULL) { if (catal != NULL) {
catal->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, catal->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
NULL, BAD_CAST catalogs, xmlCatalogDefaultPrefer); NULL, BAD_CAST catalogs, xmlCatalogDefaultPrefer);
xmlDefaultCatalog = catal; xmlDefaultCatalog = catal;
@ -3068,7 +3084,7 @@ xmlCatalogAdd(const xmlChar *type, const xmlChar *orig, const xmlChar *replace)
xmlDefaultCatalog = xmlCreateNewCatalog(XML_XML_CATALOG_TYPE, xmlDefaultCatalog = xmlCreateNewCatalog(XML_XML_CATALOG_TYPE,
xmlCatalogDefaultPrefer); xmlCatalogDefaultPrefer);
xmlDefaultCatalog->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, xmlDefaultCatalog->xml = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
orig, xmlCatalogDefaultPrefer); orig, NULL, xmlCatalogDefaultPrefer);
xmlRMutexUnlock(xmlCatalogMutex); xmlRMutexUnlock(xmlCatalogMutex);
return(0); return(0);
@ -3273,7 +3289,7 @@ xmlCatalogAddLocal(void *catalogs, const xmlChar *URL) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Adding document catalog %s\n", URL); "Adding document catalog %s\n", URL);
add = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, URL, add = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, URL, NULL,
xmlCatalogDefaultPrefer); xmlCatalogDefaultPrefer);
if (add == NULL) if (add == NULL)
return(catalogs); return(catalogs);

2
configure.in
View File

@ -6,7 +6,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2 LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=4 LIBXML_MINOR_VERSION=4
LIBXML_MICRO_VERSION=8 LIBXML_MICRO_VERSION=9
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION

8
include/libxml/xmlwin32version.h
View File

@ -27,21 +27,21 @@ extern void xmlCheckVersion(int version);
* *
* the version string like "1.2.3" * the version string like "1.2.3"
*/ */
#define LIBXML_DOTTED_VERSION "2.4.8" #define LIBXML_DOTTED_VERSION "2.4.9"
/** /**
* LIBXML_VERSION: * LIBXML_VERSION:
* *
* the version number: 1.2.3 value is 1002003 * the version number: 1.2.3 value is 1002003
*/ */
#define LIBXML_VERSION 20408 #define LIBXML_VERSION 20409
/** /**
* LIBXML_VERSION_STRING: * LIBXML_VERSION_STRING:
* *
* the version number string, 1.2.3 value is "1002003" * the version number string, 1.2.3 value is "1002003"
*/ */
#define LIBXML_VERSION_STRING "20408" #define LIBXML_VERSION_STRING "20409"
/** /**
* LIBXML_TEST_VERSION: * LIBXML_TEST_VERSION:
@ -49,7 +49,7 @@ extern void xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with * Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against * the version the software has been compiled against
*/ */
#define LIBXML_TEST_VERSION xmlCheckVersion(20408); #define LIBXML_TEST_VERSION xmlCheckVersion(20409);
#if 0 #if 0
/** /**

5
result/catalogs/catal Normal file
View File

@ -0,0 +1,5 @@
> test/catalogs/calstblx.dtd
> test/catalogs/docbook.dtd
> test/catalogs/soextblx.dtd
> test/catalogs/dbgenent.mod
>

3
result/catalogs/mycatalog.empty Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/>

7
result/catalogs/mycatalog.full Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<public publicId="Pubid" uri="sysid"/>
<public publicId="Pubid2" uri="sysid2"/>
<public publicId="Pubid3" uri="sysid3"/>
</catalog>

4
test/catalogs/catal.script Normal file
View File

@ -0,0 +1,4 @@
public "-//OASIS//DTD DocBook XML CALS Table Model V4.1//EN"
public "-//Davenport//DTD DocBook V3.0//EN"
public "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
public "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN"

2
test/catalogs/catal.sgml Normal file
View File

@ -0,0 +1,2 @@
CATALOG catal1.sgml
CATALOG catal2.sgml

1
test/catalogs/catal1.sgml Normal file
View File

@ -0,0 +1 @@
CATALOG catal3.sgml

4
test/catalogs/catal2.sgml Normal file
View File

@ -0,0 +1,4 @@
PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"

8
test/catalogs/catal3.sgml Normal file
View File

@ -0,0 +1,8 @@
PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1//EN" "calstblx.dtd"
PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1//EN" "dbpool.mod"
PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1//EN" "dbhier.mod"PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1//EN" "dbnotn.mod"
PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1//EN" "dbcent.mod"