Update libxml to 2.7.7.

third_party/libxml/xinclude.c

 /*
  * xinclude.c : Code to implement XInclude processing
  *
  * World Wide Web Consortium W3C Last Call Working Draft 10 November 2003
  * http://www.w3.org/TR/2003/WD-xinclude-20031110
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
@@ skipping 420 matching lines @@
 
     /*
      * pass in the application data to the parser context.
      */
     pctxt->_private = ctxt->_private;
     
     /*
      * try to ensure that new documents included are actually
      * built with the same dictionary as the including document.
      */
-    if ((ctxt->doc != NULL) && (ctxt->doc->dict != NULL) &&
-        (pctxt->dict != NULL)) {
-        xmlDictFree(pctxt->dict);
+    if ((ctxt->doc != NULL) && (ctxt->doc->dict != NULL)) {
+       if (pctxt->dict != NULL)
+            xmlDictFree(pctxt->dict);
         pctxt->dict = ctxt->doc->dict;
         xmlDictReference(pctxt->dict);
     }
 
     xmlCtxtUseOptions(pctxt, ctxt->parseFlags | XML_PARSE_DTDLOAD);
     
     inputStream = xmlLoadExternalEntity(URL, NULL, pctxt);
     if (inputStream == NULL) {
         xmlFreeParserCtxt(pctxt);
         return(NULL);
@@ skipping 337 matching lines @@
     ctxt->txturlTab[ctxt->txtNr] = xmlStrdup(url);
     ctxt->txtNr++;
 }
 
 /************************************************************************
  *                                                                      *
  *                      Node copy with specific semantic                *
  *                                                                      *
  ************************************************************************/
 
+static xmlNodePtr
+xmlXIncludeCopyNodeList(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target,
+                        xmlDocPtr source, xmlNodePtr elem);
+
 /**
  * xmlXIncludeCopyNode:
  * @ctxt:  the XInclude context
  * @target:  the document target
  * @source:  the document source
  * @elem:  the element
  * 
  * Make a copy of the node while preserving the XInclude semantic
  * of the Infoset copy
  */
 static xmlNodePtr
 xmlXIncludeCopyNode(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target,
                     xmlDocPtr source, xmlNodePtr elem) {
     xmlNodePtr result = NULL;
 
     if ((ctxt == NULL) || (target == NULL) || (source == NULL) ||
         (elem == NULL))
         return(NULL);
     if (elem->type == XML_DTD_NODE)
         return(NULL);
-    result = xmlDocCopyNode(elem, target, 1);
+    if (elem->type == XML_DOCUMENT_NODE)
+        result = xmlXIncludeCopyNodeList(ctxt, target, source, elem->children);
+    else
+        result = xmlDocCopyNode(elem, target, 1);
     return(result);
 }
 
 /**
  * xmlXIncludeCopyNodeList:
  * @ctxt:  the XInclude context
  * @target:  the document target
  * @source:  the document source
  * @elem:  the element list
  * 
@@ skipping 128 matching lines @@
                 const xmlChar *content = cur->content;
                 int len;
 
                 if (content == NULL) {
                     tmp = xmlNewTextLen(NULL, 0);
                 } else {
                     len = index2;
                     if ((cur == start) && (index1 > 1)) {
                         content += (index1 - 1);
                         len -= (index1 - 1);
-                        index1 = 0;
                     } else {
                         len = index2;
                     }
                     tmp = xmlNewTextLen(content, len);
                 }
                 /* single sub text node selection */
                 if (list == NULL)
                     return(tmp);
                 /* prune and return full set */
                 if (level == lastLevel)
@@ skipping 690 matching lines @@
             xmlXPathFreeObject(xptr);
         }
         xmlXPathFreeContext(xptrctxt);
         xmlFree(fragment);
     }
 #endif
 
     /*
      * Do the xml:base fixup if needed
      */
-    if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/'))) {
+    if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/')) &&
+        (!(ctxt->parseFlags & XML_PARSE_NOBASEFIX)) &&
+        (!(doc->parseFlags & XML_PARSE_NOBASEFIX))) {
         xmlNodePtr node;
         xmlChar *base;
         xmlChar *curBase;
 
         /*
          * The base is only adjusted if "necessary", i.e. if the xinclude node
          * has a base specified, or the URL is relative
          */
         base = xmlGetNsProp(ctxt->incTab[nr]->ref, BAD_CAST "base",
                         XML_XML_NAMESPACE);
@@ skipping 722 matching lines @@
  *
  * Returns 0 in case of success and -1 in case of error.
  */
 int
 xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) {
     if (ctxt == NULL)
         return(-1);
     ctxt->parseFlags = flags;
     return(0);
 }
- 
+
+/**
+ * xmlXIncludeProcessTreeFlagsData:
+ * @tree: an XML node
+ * @flags: a set of xmlParserOption used for parsing XML includes
+ * @data: application data that will be passed to the parser context
+ *        in the _private field of the parser context(s)
+ *
+ * Implement the XInclude substitution on the XML node @tree
+ *
+ * Returns 0 if no substitution were done, -1 if some processing failed
+ *    or the number of substitutions done.
+ */
+
+int
+xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree, int flags, void *data) {
+    xmlXIncludeCtxtPtr ctxt;
+    int ret = 0;
+
+    if ((tree == NULL) || (tree->doc == NULL))
+        return(-1);
+
+    ctxt = xmlXIncludeNewContext(tree->doc);
+    if (ctxt == NULL)
+        return(-1);
+    ctxt->_private = data;
+    ctxt->base = xmlStrdup((xmlChar *)tree->doc->URL);
+    xmlXIncludeSetFlags(ctxt, flags);
+    ret = xmlXIncludeDoProcess(ctxt, tree->doc, tree);
+    if ((ret >= 0) && (ctxt->nbErrors > 0))
+        ret = -1;
+
+    xmlXIncludeFreeContext(ctxt);
+    return(ret);
+}
+
 /**
  * xmlXIncludeProcessFlagsData:
  * @doc: an XML document
  * @flags: a set of xmlParserOption used for parsing XML includes
  * @data: application data that will be passed to the parser context
  *        in the _private field of the parser context(s)
  *
  * Implement the XInclude substitution on the XML document @doc
  *
  * Returns 0 if no substitution were done, -1 if some processing failed
  *    or the number of substitutions done.
  */
 int
 xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) {
-    xmlXIncludeCtxtPtr ctxt;
     xmlNodePtr tree;
-    int ret = 0;
 
     if (doc == NULL)
         return(-1);
     tree = xmlDocGetRootElement(doc);
     if (tree == NULL)
         return(-1);
-    ctxt = xmlXIncludeNewContext(doc);
-    if (ctxt == NULL)
-        return(-1);
-    ctxt->_private = data;
-    ctxt->base = xmlStrdup((xmlChar *)doc->URL);
-    xmlXIncludeSetFlags(ctxt, flags);
-    ret = xmlXIncludeDoProcess(ctxt, doc, tree);
-    if ((ret >= 0) && (ctxt->nbErrors > 0))
-        ret = -1;
-
-    xmlXIncludeFreeContext(ctxt);
-    return(ret);
+    return(xmlXIncludeProcessTreeFlagsData(tree, flags, data));
 }
 
 /**
  * xmlXIncludeProcessFlags:
  * @doc: an XML document
  * @flags: a set of xmlParserOption used for parsing XML includes
  *
  * Implement the XInclude substitution on the XML document @doc
  *
  * Returns 0 if no substitution were done, -1 if some processing failed
@@ skipping 82 matching lines @@
     ret = xmlXIncludeDoProcess(ctxt, node->doc, node);
     if ((ret >= 0) && (ctxt->nbErrors > 0))
         ret = -1;
     return(ret);
 }
 
 #else /* !LIBXML_XINCLUDE_ENABLED */
 #endif
 #define bottom_xinclude
 #include "elfgcchack.h"