lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-31 02:43:06 +03:00
Code Activity

xsltproc should return an error code if xinclude fails

Browse Source 
When running xsltproc with the --xinclude option and if the included file
contains parse errors, then xsltproc exits with a success return code (0)
rather than an error code.  This is despite the fact that parser error
messages are printed out.
* xsltproc/xsltproc.c: check xinclude processing function return code,
  fail with error 6 if it went wrong.
This commit is contained in:
Malcolm Purvis
2012-08-16 17:08:31 +08:00
committed by Daniel Veillard
parent a2051bf912
commit e669a8c7ce
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xsltproc/xsltproc.c
View File

@ -359,16 +359,23 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) {
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
if (xinclude) { if (xinclude) {
int ret;
if (timing) if (timing)
startTimer(); startTimer();
#if LIBXML_VERSION >= 20603 #if LIBXML_VERSION >= 20603
xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS); ret = xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS);
#else #else
xmlXIncludeProcess(doc); ret = xmlXIncludeProcess(doc);
#endif #endif
if (timing) { if (timing) {
endTimer("XInclude processing %s", filename); endTimer("XInclude processing %s", filename);
} }
if (ret < 0) {
errorno = 6;
return;
}
} }
#endif #endif
if (timing) if (timing)