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

catalog: Only use XML_SYSCONFDIR if catalogs are enabled

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-11-21 23:22:40 +01:00
parent 52afde07c1
commit 1dc5e50a8e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtest.c
View File

@ -3389,9 +3389,11 @@ static int urip_rlen;
*/
static int
uripMatch(const char * URI) {
#ifdef LIBXML_CATALOG_ENABLED
if ((URI == NULL) ||
(!strcmp(URI, "file://" XML_SYSCONFDIR "/xml/catalog")))
return(0);
#endif
/* Verify we received the escaped URL */
if (strcmp(urip_rcvsURLs[urip_current], URI))
urip_success = 0;
@ -3409,9 +3411,11 @@ uripMatch(const char * URI) {
*/
static void *
uripOpen(const char * URI) {
#ifdef LIBXML_CATALOG_ENABLED
if ((URI == NULL) ||
(!strcmp(URI, "file://" XML_SYSCONFDIR "/xml/catalog")))
return(NULL);
#endif
/* Verify we received the escaped URL */
if (strcmp(urip_rcvsURLs[urip_current], URI))
urip_success = 0;

7
xmllint.c
View File

@ -77,10 +77,6 @@
#define ERR_STREAM stderr
#endif
#ifndef XML_XML_DEFAULT_CATALOG
#define XML_XML_DEFAULT_CATALOG "file://" XML_SYSCONFDIR "/xml/catalog"
#endif
#ifndef STDIN_FILENO
#define STDIN_FILENO 0
#endif
@ -2709,7 +2705,8 @@ static void usage(FILE *f, const char *name) {
#ifdef LIBXML_CATALOG_ENABLED
fprintf(f, "\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
fprintf(f, "\t otherwise XML Catalogs starting from \n");
fprintf(f, "\t %s are activated by default\n", XML_XML_DEFAULT_CATALOG);
fprintf(f, "\t file://" XML_SYSCONFDIR "/xml/catalog "
"are activated by default\n");
fprintf(f, "\t--nocatalogs: deactivate all catalogs\n");
#endif
fprintf(f, "\t--auto : generate a small doc on the fly\n");