shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-05 05:47:00 +03:00
Code

catalog: Fetch XML catalog before dumping

Browse Source 
Catalog entries seem to be loaded lazily.

Should fix #699.
This commit is contained in:
Nick Wellnhofer 2024-03-03 21:57:59 +01:00
parent 653ef99902
commit 723b4de040
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
catalog.c
View File

@ -59,9 +59,6 @@
#define XML_SGML_DEFAULT_CATALOG "file://" SYSCONFDIR "/sgml/catalog"
#endif
static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID);
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
/************************************************************************
* *
* Types, all private *
@ -176,6 +173,21 @@ static xmlRMutexPtr xmlCatalogMutex = NULL;
*/
static int xmlCatalogInitialized = 0;
/************************************************************************
* *
* Forward declarations *
* *
************************************************************************/
static xmlChar *
xmlCatalogNormalizePublic(const xmlChar *pubID);
static int
xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
static int
xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal);
/************************************************************************
* *
* Catalog error handlers *
@ -526,6 +538,9 @@ static void xmlDumpXMLCatalogNode(xmlCatalogEntryPtr catal, xmlNodePtr catalog,
case XML_CATA_BROKEN_CATALOG:
case XML_CATA_CATALOG:
if (cur == catal) {
if (cur->children == NULL) {
xmlFetchXMLCatalogFile(cur);
}
cur = cur->children;
continue;
}