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

xmllint: Improve error reports from reader

Browse Source
This commit is contained in:
Nick Wellnhofer 2025-01-17 22:54:51 +01:00
parent 16286dea31
commit 1c82bca6bd
2 changed files with 141 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xmlIO.c
View File

@ -1494,11 +1494,25 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
xmlParserInputBufferPtr
xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
xmlParserInputBufferPtr ret;
int code;
if (xmlParserInputBufferCreateFilenameValue != NULL)
return(xmlParserInputBufferCreateFilenameValue(URI, enc));
xmlParserInputBufferCreateUrl(URI, enc, 0, &ret);
code = xmlParserInputBufferCreateUrl(URI, enc, 0, &ret);
/*
* xmlParserInputBufferCreateFilename has no way to return
* the kind of error although it really is crucial.
* All we can do is to set the global error.
*/
if ((code != XML_ERR_OK) && (code != XML_IO_ENOENT)) {
if (xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_IO, code,
XML_ERR_ERROR, URI, 0, NULL, NULL, NULL, 0, 0,
"Failed to open file\n") < 0)
xmlRaiseMemoryError(NULL, NULL, NULL, XML_FROM_IO, NULL);
}
return(ret);
}

53
xmllint.c
View File

@ -1684,6 +1684,7 @@ static void processNode(xmllintState *lint, xmlTextReaderPtr reader) {
}
static void streamFile(xmllintState *lint, const char *filename) {
xmlParserInputBufferPtr input = NULL;
FILE *errStream = lint->errStream;
xmlTextReaderPtr reader;
int ret;
@ -1694,10 +1695,50 @@ static void streamFile(xmllintState *lint, const char *filename) {
filename, NULL, lint->options);
} else
#endif
if (strcmp(filename, "-") == 0)
{
if (strcmp(filename, "-") == 0) {
reader = xmlReaderForFd(STDIN_FILENO, "-", NULL, lint->options);
else
reader = xmlReaderForFile(filename, NULL, lint->options);
}
else {
/*
* There's still no easy way to get a reader for a file with
* adequate error repoting.
*/
xmlResetLastError();
input = xmlParserInputBufferCreateFilename(filename,
XML_CHAR_ENCODING_NONE);
if (input == NULL) {
const xmlError *error = xmlGetLastError();
if ((error != NULL) && (error->code == XML_ERR_NO_MEMORY)) {
lint->progresult = XMLLINT_ERR_MEM;
} else {
fprintf(errStream, "Unable to open %s\n", filename);
lint->progresult = XMLLINT_ERR_RDFILE;
}
return;
}
reader = xmlNewTextReader(input, filename);
if (reader == NULL) {
lint->progresult = XMLLINT_ERR_MEM;
xmlFreeParserInputBuffer(input);
return;
}
if (xmlTextReaderSetup(reader, NULL, NULL, NULL,
lint->options) < 0) {
lint->progresult = XMLLINT_ERR_MEM;
xmlFreeParserInputBuffer(input);
return;
}
}
}
if (reader == NULL) {
lint->progresult = XMLLINT_ERR_MEM;
return;
}
#ifdef LIBXML_PATTERN_ENABLED
if (lint->patternc != NULL) {
lint->patstream = xmlPatternGetStreamCtxt(lint->patternc);
@ -1713,7 +1754,6 @@ static void streamFile(xmllintState *lint, const char *filename) {
#endif
if (reader != NULL) {
xmlTextReaderSetResourceLoader(reader, xmllintResourceLoader, lint);
if (lint->maxAmpl > 0)
xmlTextReaderSetMaxAmplification(reader, lint->maxAmpl);
@ -1806,14 +1846,11 @@ static void streamFile(xmllintState *lint, const char *filename) {
* Done, cleanup and status
*/
xmlFreeTextReader(reader);
xmlFreeParserInputBuffer(input);
if (ret != 0) {
fprintf(errStream, "%s : failed to parse\n", filename);
lint->progresult = XMLLINT_ERR_UNCLASS;
}
} else {
fprintf(errStream, "Unable to open %s\n", filename);
lint->progresult = XMLLINT_ERR_UNCLASS;
}
#ifdef LIBXML_PATTERN_ENABLED
if (lint->patstream != NULL) {
xmlFreeStreamCtxt(lint->patstream);