[xml/sgml-commit] r576 - in packages/libxslt: . trunk/debian
trunk/doc trunk/xsltproc
Mike Hommey
glandium at costa.debian.org
Sat Aug 26 11:07:25 UTC 2006
Author: glandium
Date: 2006-08-26 11:07:24 +0000 (Sat, 26 Aug 2006)
New Revision: 576
Modified:
packages/libxslt/
packages/libxslt/trunk/debian/changelog
packages/libxslt/trunk/doc/xsltproc.1
packages/libxslt/trunk/doc/xsltproc.html
packages/libxslt/trunk/doc/xsltproc.xml
packages/libxslt/trunk/xsltproc/xsltproc.c
Log:
r1111 at namakemono: mh | 2006-08-26 12:15:26 +0200
* xsltproc/xsltproc.c: Return an error code 11 if there was an error while
writing the output file. Note that this doesn't make a difference between
permission error, parent directory existance or out of space errors.
Closes: #356486.
* doc/xsltproc.1, doc/xsltproc.html, doc/xsltproc.xml: Updated documentation
accordingly.
* xsltproc/xsltproc.c: Applied patch from upstream CVS to allow xsltproc to
do XInclude processing. Closes: #383408.
Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
- 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1107
+ 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1111
Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog 2006-08-03 06:21:06 UTC (rev 575)
+++ packages/libxslt/trunk/debian/changelog 2006-08-26 11:07:24 UTC (rev 576)
@@ -1,3 +1,16 @@
+libxslt (1.1.17-4) unstable; urgency=low
+
+ * xsltproc/xsltproc.c: Return an error code 11 if there was an error while
+ writing the output file. Note that this doesn't make a difference between
+ permission error, parent directory existance or out of space errors.
+ Closes: #356486.
+ * doc/xsltproc.1, doc/xsltproc.html, doc/xsltproc.xml: Updated documentation
+ accordingly.
+ * xsltproc/xsltproc.c: Applied patch from upstream CVS to allow xsltproc to
+ do XInclude processing. Closes: #383408.
+
+ -- Mike Hommey <glandium at debian.org> Sat, 26 Aug 2006 12:12:59 +0200
+
libxslt (1.1.17-3) unstable; urgency=medium
* debian/libxslt1.install: Really removed.
Modified: packages/libxslt/trunk/doc/xsltproc.1
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.1 2006-08-03 06:21:06 UTC (rev 575)
+++ packages/libxslt/trunk/doc/xsltproc.1 2006-08-26 11:07:24 UTC (rev 576)
@@ -227,6 +227,9 @@
.TP
\fB10\fR
Processing was stopped by a terminating message
+.TP
+\fB11\fR
+Could not write the result to the output file
.SH "SEE ALSO"
.PP
\fBlibxslt\fR(3)
Modified: packages/libxslt/trunk/doc/xsltproc.html
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.html 2006-08-03 06:21:06 UTC (rev 575)
+++ packages/libxslt/trunk/doc/xsltproc.html 2006-08-26 11:07:24 UTC (rev 576)
@@ -90,6 +90,6 @@
<code class="option">--nodtdattr</code>
</span></dt><dd>Do not apply default attributes from the
document's <span class="acronym">DTD</span>.</dd></dl></div></div><div class="refsect1" lang="en"><a name="envar"></a><h2>ENVIRONMENT</h2><div class="variablelist"><dl><dt><span class="term"><code class="envar">SGML_CATALOG_FILES</code></span></dt><dd><p>...</p></dd><dt><span class="term"><code class="envar">XML_CATALOG_FILES</code></span></dt><dd><p>...</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="return"></a><h2>DIAGNOSTICS</h2><p><span><strong class="command">xsltproc</strong></span>'s return codes provide information
- that can be used when calling it from scripts.</p><div class="variablelist"><dl><dt><span class="term"><span class="errorcode">0</span></span></dt><dd><p>normal</p></dd><dt><span class="term"><span class="errorcode">1</span></span></dt><dd><p>no argument</p></dd><dt><span class="term"><span class="errorcode">2</span></span></dt><dd><p>too many parameters</p></dd><dt><span class="term"><span class="errorcode">3</span></span></dt><dd><p>unknown option</p></dd><dt><span class="term"><span class="errorcode">4</span></span></dt><dd><p>failed to parse the stylesheet</p></dd><dt><span class="term"><span class="errorcode">5</span></span></dt><dd><p>error in the stylesheet</p></dd><dt><span class="term"><span class="errorcode">6</span></span></dt><dd><p>error in one of the documents</p></dd><dt><span class="term"><span class="errorcode">7</span></span></dt><dd><p>unsupported xsl:output method</p></dd><dt><span class="term"><span class="errorcode">8</span></span></dt><dd><p>string parameter contains both quote and double-quotes</p></dd><dt><span class="term"><span class="errorcode">9</span></span></dt><dd><p>internal processing error</p></dd><dt><span class="term"><span class="errorcode">10</span></span></dt><dd><p>processing was stopped by a terminating message</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="moreinfo"></a><h2>SEE ALSO</h2><p>More information can be found at the <span class="application">libxml</span> web pages
+ that can be used when calling it from scripts.</p><div class="variablelist"><dl><dt><span class="term"><span class="errorcode">0</span></span></dt><dd><p>normal</p></dd><dt><span class="term"><span class="errorcode">1</span></span></dt><dd><p>no argument</p></dd><dt><span class="term"><span class="errorcode">2</span></span></dt><dd><p>too many parameters</p></dd><dt><span class="term"><span class="errorcode">3</span></span></dt><dd><p>unknown option</p></dd><dt><span class="term"><span class="errorcode">4</span></span></dt><dd><p>failed to parse the stylesheet</p></dd><dt><span class="term"><span class="errorcode">5</span></span></dt><dd><p>error in the stylesheet</p></dd><dt><span class="term"><span class="errorcode">6</span></span></dt><dd><p>error in one of the documents</p></dd><dt><span class="term"><span class="errorcode">7</span></span></dt><dd><p>unsupported xsl:output method</p></dd><dt><span class="term"><span class="errorcode">8</span></span></dt><dd><p>string parameter contains both quote and double-quotes</p></dd><dt><span class="term"><span class="errorcode">9</span></span></dt><dd><p>internal processing error</p></dd><dt><span class="term"><span class="errorcode">10</span></span></dt><dd><p>processing was stopped by a terminating message</p></dd><dt><span class="term"><span class="errorcode">11</span></span></dt><dd><p>could not write the result to the output file</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="moreinfo"></a><h2>SEE ALSO</h2><p>More information can be found at the <span class="application">libxml</span> web pages
at <a href="http://www.xmlsoft.org/" target="_top">http://www.xmlsoft.org/</a> and the W3C <span class="acronym">XSLT</span>
pages at <a href="http://www.w3.org/TR/xslt" target="_top">http://www.w3.org/TR/xslt</a>.</p></div></div></body></html>
Modified: packages/libxslt/trunk/doc/xsltproc.xml
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.xml 2006-08-03 06:21:06 UTC (rev 575)
+++ packages/libxslt/trunk/doc/xsltproc.xml 2006-08-26 11:07:24 UTC (rev 576)
@@ -518,6 +518,13 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><errorcode>11</errorcode></term>
+ <listitem>
+ <para>Could not write the result to the output file</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>
Modified: packages/libxslt/trunk/xsltproc/xsltproc.c
===================================================================
--- packages/libxslt/trunk/xsltproc/xsltproc.c 2006-08-03 06:21:06 UTC (rev 575)
+++ packages/libxslt/trunk/xsltproc/xsltproc.c 2006-08-26 11:07:24 UTC (rev 576)
@@ -353,6 +353,7 @@
xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) {
xmlDocPtr res;
xsltTransformContextPtr ctxt;
+ int ret;
#ifdef LIBXML_XINCLUDE_ENABLED
@@ -458,12 +459,14 @@
if (ctxt == NULL)
return;
if (profile) {
- xsltRunStylesheetUser(cur, doc, params, output,
+ ret = xsltRunStylesheetUser(cur, doc, params, output,
NULL, NULL, stderr, ctxt);
} else {
- xsltRunStylesheetUser(cur, doc, params, output,
+ ret = xsltRunStylesheetUser(cur, doc, params, output,
NULL, NULL, NULL, ctxt);
}
+ if (ret == -1)
+ errorno = 11;
if (ctxt->state == XSLT_STATE_ERROR)
errorno = 9;
else if (ctxt->state == XSLT_STATE_STOPPED)
@@ -777,6 +780,18 @@
style = xmlReadFile((const char *) argv[i], NULL, options);
if (timing)
endTimer("Parsing stylesheet %s", argv[i]);
+ if (style != NULL) {
+ if (timing)
+ startTimer();
+#if LIBXML_VERSION >= 20603
+ xmlXIncludeProcessFlags(style, XSLT_PARSE_OPTIONS);
+#else
+ xmlXIncludeProcess(style);
+#endif
+ if (timing) {
+ endTimer("XInclude processing %s", argv[i]);
+ }
+ }
if (style == NULL) {
fprintf(stderr, "cannot parse %s\n", argv[i]);
cur = NULL;
More information about the debian-xml-sgml-commit
mailing list