mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-10-26 12:25:09 +03:00
started some serious testing and fixed a few bug and optmization needs.
* catalog.c xmlIO.c: started some serious testing and fixed a few bug and optmization needs. Daniel
This commit is contained in:
Daniel Veillard
parent
9f7b84bb07
commit
6990bf3c08
@ -1,3 +1,8 @@
|
||||
Thu Aug 23 23:16:32 CEST 2001 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* catalog.c xmlIO.c: started some serious testing and fixed
|
||||
a few bug and optmization needs.
|
||||
|
||||
Thu Aug 23 17:26:58 CEST 2001 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* Makefile.am configure.in include/libxml/xmlwin32version.h:
|
||||
|
||||
149
catalog.c
149
catalog.c
@ -35,6 +35,8 @@
|
||||
#include <libxml/catalog.h>
|
||||
#include <libxml/xmlerror.h>
|
||||
|
||||
#define MAX_DELEGATE 50
|
||||
|
||||
/**
|
||||
* TODO:
|
||||
*
|
||||
@ -92,11 +94,13 @@ struct _xmlCatalogEntry {
|
||||
xmlChar *name;
|
||||
xmlChar *value;
|
||||
xmlCatalogPrefer prefer;
|
||||
int dealloc;
|
||||
};
|
||||
|
||||
static xmlCatalogAllow xmlCatalogDefaultAllow = XML_CATA_ALLOW_ALL;
|
||||
static xmlCatalogPrefer xmlCatalogDefaultPrefer = XML_CATA_PREFER_SYSTEM;
|
||||
static xmlCatalogPrefer xmlCatalogDefaultPrefer = XML_CATA_PREFER_PUBLIC;
|
||||
static xmlHashTablePtr xmlDefaultCatalog;
|
||||
static xmlHashTablePtr xmlCatalogXMLFiles = NULL;
|
||||
static xmlCatalogEntryPtr xmlDefaultXMLCatalogList = NULL;
|
||||
static int xmlCatalogInitialized = 0;
|
||||
|
||||
@ -138,6 +142,7 @@ xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name,
|
||||
else
|
||||
ret->value = NULL;
|
||||
ret->prefer = prefer;
|
||||
ret->dealloc = 1;
|
||||
return(ret);
|
||||
}
|
||||
|
||||
@ -148,7 +153,7 @@ static void
|
||||
xmlFreeCatalogEntry(xmlCatalogEntryPtr ret) {
|
||||
if (ret == NULL)
|
||||
return;
|
||||
if (ret->children != NULL)
|
||||
if ((ret->children != NULL) && (ret->dealloc == 1))
|
||||
xmlFreeCatalogEntryList(ret->children);
|
||||
if (ret->name != NULL)
|
||||
xmlFree(ret->name);
|
||||
@ -362,6 +367,10 @@ xmlParseCatalogFile(const char *filename) {
|
||||
directory = xmlParserGetDirectory(filename);
|
||||
if ((ctxt->directory == NULL) && (directory != NULL))
|
||||
ctxt->directory = directory;
|
||||
ctxt->valid = 0;
|
||||
ctxt->validate = 0;
|
||||
ctxt->loadsubset = 0;
|
||||
ctxt->pedantic = 0;
|
||||
|
||||
xmlParseDocument(ctxt);
|
||||
|
||||
@ -712,7 +721,7 @@ xmlParseXMLCatalogFile(xmlCatalogPrefer prefer, const xmlChar *filename) {
|
||||
*/
|
||||
static int
|
||||
xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
|
||||
xmlCatalogEntryPtr children;
|
||||
xmlCatalogEntryPtr children = NULL, doc;
|
||||
|
||||
if (catal == NULL)
|
||||
return(-1);
|
||||
@ -721,20 +730,44 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
|
||||
if (catal->children != NULL)
|
||||
return(-1);
|
||||
|
||||
if (xmlCatalogXMLFiles != NULL)
|
||||
children = (xmlCatalogEntryPtr)
|
||||
xmlHashLookup(xmlCatalogXMLFiles, catal->value);
|
||||
if (children != NULL) {
|
||||
catal->children = children;
|
||||
catal->dealloc = 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Fetch and parse
|
||||
*/
|
||||
children = xmlParseXMLCatalogFile(catal->prefer, catal->value);
|
||||
if (children == NULL) {
|
||||
doc = xmlParseXMLCatalogFile(catal->prefer, catal->value);
|
||||
if (doc == NULL) {
|
||||
catal->type = XML_CATA_BROKEN_CATALOG;
|
||||
return(-1);
|
||||
}
|
||||
if ((catal->type == XML_CATA_CATALOG) &&
|
||||
(doc->type == XML_CATA_CATALOG)) {
|
||||
children = doc->children;
|
||||
doc->children = NULL;
|
||||
xmlFreeCatalogEntryList(doc);
|
||||
} else {
|
||||
children = doc;
|
||||
}
|
||||
|
||||
/*
|
||||
* Where a real test and set would be needed !
|
||||
*/
|
||||
if (catal->children == NULL) {
|
||||
catal->children = children;
|
||||
catal->dealloc = 1;
|
||||
if (xmlCatalogXMLFiles == NULL)
|
||||
xmlCatalogXMLFiles = xmlHashCreate(10);
|
||||
if (xmlCatalogXMLFiles != NULL) {
|
||||
if (children != NULL)
|
||||
xmlHashAddEntry(xmlCatalogXMLFiles, catal->value, children);
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
* Another thread filled it before us
|
||||
@ -1069,6 +1102,9 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
|
||||
return(ret);
|
||||
}
|
||||
if (haveDelegate) {
|
||||
const xmlChar *delegates[MAX_DELEGATE];
|
||||
int nbList = 0, i;
|
||||
|
||||
/*
|
||||
* Assume the entries have been sorted by decreasing substring
|
||||
* matches when the list was produced.
|
||||
@ -1077,6 +1113,16 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
|
||||
while (cur != NULL) {
|
||||
if ((cur->type == XML_CATA_DELEGATE_SYSTEM) &&
|
||||
(!xmlStrncmp(sysID, cur->name, xmlStrlen(cur->name)))) {
|
||||
for (i = 0;i < nbList;i++)
|
||||
if (xmlStrEqual(cur->value, delegates[i]))
|
||||
break;
|
||||
if (i < nbList) {
|
||||
cur = cur->next;
|
||||
continue;
|
||||
}
|
||||
if (nbList < MAX_DELEGATE)
|
||||
delegates[nbList++] = cur->value;
|
||||
|
||||
if (cur->children == NULL) {
|
||||
xmlFetchXMLCatalogFile(cur);
|
||||
}
|
||||
@ -1129,6 +1175,9 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
|
||||
cur = cur->next;
|
||||
}
|
||||
if (haveDelegate) {
|
||||
const xmlChar *delegates[MAX_DELEGATE];
|
||||
int nbList = 0, i;
|
||||
|
||||
/*
|
||||
* Assume the entries have been sorted by decreasing substring
|
||||
* matches when the list was produced.
|
||||
@ -1138,6 +1187,17 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
|
||||
if ((cur->type == XML_CATA_DELEGATE_PUBLIC) &&
|
||||
(cur->prefer == XML_CATA_PREFER_PUBLIC) &&
|
||||
(!xmlStrncmp(pubID, cur->name, xmlStrlen(cur->name)))) {
|
||||
|
||||
for (i = 0;i < nbList;i++)
|
||||
if (xmlStrEqual(cur->value, delegates[i]))
|
||||
break;
|
||||
if (i < nbList) {
|
||||
cur = cur->next;
|
||||
continue;
|
||||
}
|
||||
if (nbList < MAX_DELEGATE)
|
||||
delegates[nbList++] = cur->value;
|
||||
|
||||
if (cur->children == NULL) {
|
||||
xmlFetchXMLCatalogFile(cur);
|
||||
}
|
||||
@ -1253,6 +1313,9 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
|
||||
return(ret);
|
||||
}
|
||||
if (haveDelegate) {
|
||||
const xmlChar *delegates[MAX_DELEGATE];
|
||||
int nbList = 0, i;
|
||||
|
||||
/*
|
||||
* Assume the entries have been sorted by decreasing substring
|
||||
* matches when the list was produced.
|
||||
@ -1261,6 +1324,16 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
|
||||
while (cur != NULL) {
|
||||
if ((cur->type == XML_CATA_DELEGATE_SYSTEM) &&
|
||||
(!xmlStrncmp(URI, cur->name, xmlStrlen(cur->name)))) {
|
||||
for (i = 0;i < nbList;i++)
|
||||
if (xmlStrEqual(cur->value, delegates[i]))
|
||||
break;
|
||||
if (i < nbList) {
|
||||
cur = cur->next;
|
||||
continue;
|
||||
}
|
||||
if (nbList < MAX_DELEGATE)
|
||||
delegates[nbList++] = cur->value;
|
||||
|
||||
if (cur->children == NULL) {
|
||||
xmlFetchXMLCatalogFile(cur);
|
||||
}
|
||||
@ -2007,12 +2080,17 @@ xmlCatalogCleanup(void) {
|
||||
if (xmlDebugCatalogs)
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Catalogs cleanup\n");
|
||||
if (xmlCatalogXMLFiles != NULL)
|
||||
xmlHashFree(xmlCatalogXMLFiles, NULL);
|
||||
xmlCatalogXMLFiles = NULL;
|
||||
if (xmlDefaultXMLCatalogList != NULL)
|
||||
xmlFreeCatalogEntryList(xmlDefaultXMLCatalogList);
|
||||
xmlDefaultXMLCatalogList = NULL;
|
||||
xmlDefaultXMLCatalogList = NULL;
|
||||
if (xmlDefaultCatalog != NULL)
|
||||
xmlHashFree(xmlDefaultCatalog,
|
||||
(xmlHashDeallocator) xmlFreeCatalogEntry);
|
||||
xmlDefaultCatalog = NULL;
|
||||
xmlDebugCatalogs = 0;
|
||||
xmlDefaultCatalog = NULL;
|
||||
xmlCatalogInitialized = 0;
|
||||
@ -2182,11 +2260,25 @@ xmlCatalogResolvePublic(const xmlChar *pubID) {
|
||||
*/
|
||||
xmlChar *
|
||||
xmlCatalogResolve(const xmlChar *pubID, const xmlChar *sysID) {
|
||||
if ((pubID == NULL) && (sysID == NULL))
|
||||
return(NULL);
|
||||
|
||||
if (!xmlCatalogInitialized)
|
||||
xmlInitializeCatalog();
|
||||
|
||||
if (xmlDebugCatalogs)
|
||||
if (pubID != NULL)
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Resolve: pubID %s\n", pubID);
|
||||
else
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Resolve: sysID %s\n", sysID);
|
||||
|
||||
if (xmlDefaultXMLCatalogList != NULL) {
|
||||
return(xmlCatalogListXMLResolve(xmlDefaultXMLCatalogList, pubID, sysID));
|
||||
xmlChar *ret;
|
||||
ret = xmlCatalogListXMLResolve(xmlDefaultXMLCatalogList, pubID, sysID);
|
||||
if ((ret != NULL) && (ret != XML_CATAL_BREAK))
|
||||
return(ret);
|
||||
} else {
|
||||
const xmlChar *ret;
|
||||
|
||||
@ -2211,8 +2303,19 @@ xmlCatalogResolveURI(const xmlChar *URI) {
|
||||
if (!xmlCatalogInitialized)
|
||||
xmlInitializeCatalog();
|
||||
|
||||
if (URI == NULL)
|
||||
return(NULL);
|
||||
|
||||
if (xmlDebugCatalogs)
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Resolve URI %s\n", URI);
|
||||
|
||||
if (xmlDefaultXMLCatalogList != NULL) {
|
||||
return(xmlCatalogListXMLResolveURI(xmlDefaultXMLCatalogList, URI));
|
||||
xmlChar *ret;
|
||||
|
||||
ret = xmlCatalogListXMLResolveURI(xmlDefaultXMLCatalogList, URI);
|
||||
if ((ret != NULL) && (ret != XML_CATAL_BREAK))
|
||||
return(ret);
|
||||
} else {
|
||||
const xmlChar *ret;
|
||||
|
||||
@ -2477,13 +2580,29 @@ xmlChar *
|
||||
xmlCatalogLocalResolve(void *catalogs, const xmlChar *pubID,
|
||||
const xmlChar *sysID) {
|
||||
xmlCatalogEntryPtr catal;
|
||||
xmlChar *ret;
|
||||
|
||||
if ((pubID == NULL) && (sysID == NULL))
|
||||
return(NULL);
|
||||
|
||||
if (!xmlCatalogInitialized)
|
||||
xmlInitializeCatalog();
|
||||
|
||||
if (xmlDebugCatalogs)
|
||||
if (pubID != NULL)
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Local resolve: pubID %s\n", pubID);
|
||||
else
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Local resolve: sysID %s\n", sysID);
|
||||
|
||||
catal = (xmlCatalogEntryPtr) catalogs;
|
||||
if (catal == NULL)
|
||||
return(NULL);
|
||||
return(xmlCatalogListXMLResolve(catal, pubID, sysID));
|
||||
ret = xmlCatalogListXMLResolve(catal, pubID, sysID);
|
||||
if ((ret != NULL) && (ret != XML_CATAL_BREAK))
|
||||
return(ret);
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2500,13 +2619,25 @@ xmlCatalogLocalResolve(void *catalogs, const xmlChar *pubID,
|
||||
xmlChar *
|
||||
xmlCatalogLocalResolveURI(void *catalogs, const xmlChar *URI) {
|
||||
xmlCatalogEntryPtr catal;
|
||||
xmlChar *ret;
|
||||
|
||||
if (URI == NULL)
|
||||
return(NULL);
|
||||
|
||||
if (!xmlCatalogInitialized)
|
||||
xmlInitializeCatalog();
|
||||
|
||||
if (xmlDebugCatalogs)
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Resolve URI %s\n", URI);
|
||||
|
||||
catal = (xmlCatalogEntryPtr) catalogs;
|
||||
if (catal == NULL)
|
||||
return(NULL);
|
||||
return(xmlCatalogListXMLResolveURI(catal, URI));
|
||||
ret = xmlCatalogListXMLResolveURI(catal, URI);
|
||||
if ((ret != NULL) && (ret != XML_CATAL_BREAK))
|
||||
return(ret);
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
#endif /* LIBXML_CATALOG_ENABLED */
|
||||
|
||||
43
xmlIO.c
43
xmlIO.c
@ -2359,6 +2359,34 @@ xmlParserGetDirectory(const char *filename) {
|
||||
* *
|
||||
****************************************************************/
|
||||
|
||||
#ifdef LIBXML_CATALOG_ENABLED
|
||||
static int xmlSysIDExists(const char *URL) {
|
||||
#ifdef HAVE_STAT
|
||||
int ret;
|
||||
struct stat info;
|
||||
const char *path;
|
||||
|
||||
if (URL == NULL)
|
||||
return(0);
|
||||
|
||||
if (!strncmp(URL, "file://localhost", 16))
|
||||
path = &URL[16];
|
||||
else if (!strncmp(URL, "file:///", 8)) {
|
||||
#ifdef _WIN32
|
||||
path = &URL[8];
|
||||
#else
|
||||
path = &URL[7];
|
||||
#endif
|
||||
} else
|
||||
path = URL;
|
||||
ret = stat(path, &info);
|
||||
if (ret == 0)
|
||||
return(1);
|
||||
#endif
|
||||
return(0);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* xmlDefaultExternalEntityLoader:
|
||||
* @URL: the URL for the entity to load
|
||||
@ -2376,9 +2404,6 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
|
||||
xmlParserInputPtr ret = NULL;
|
||||
xmlChar *resource = NULL;
|
||||
#ifdef LIBXML_CATALOG_ENABLED
|
||||
#ifdef HAVE_STAT
|
||||
struct stat info;
|
||||
#endif
|
||||
xmlCatalogAllow pref;
|
||||
#endif
|
||||
|
||||
@ -2393,11 +2418,7 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
|
||||
*/
|
||||
pref = xmlCatalogGetDefaults();
|
||||
|
||||
if ((pref != XML_CATA_ALLOW_NONE)
|
||||
#ifdef HAVE_STAT
|
||||
&& ((URL == NULL) || (stat(URL, &info) < 0))
|
||||
#endif
|
||||
) {
|
||||
if ((pref != XML_CATA_ALLOW_NONE) && (!xmlSysIDExists(URL))) {
|
||||
/*
|
||||
* Do a local lookup
|
||||
*/
|
||||
@ -2423,11 +2444,7 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
|
||||
/*
|
||||
* TODO: do an URI lookup on the reference
|
||||
*/
|
||||
if ((resource != NULL)
|
||||
#ifdef HAVE_STAT
|
||||
&& (stat((const char *) resource, &info) < 0)
|
||||
#endif
|
||||
) {
|
||||
if ((resource != NULL) && (!xmlSysIDExists((const char *)resource))) {
|
||||
xmlChar *tmp = NULL;
|
||||
|
||||
if ((ctxt->catalogs != NULL) &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user