Update libxml to 2.7.7.

third_party/libxml/xmlsave.c

 /*
  * xmlsave.c: Implemetation of the document serializer
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 #define IN_LIBXML
 #include "libxml.h"
@@ skipping 439 matching lines @@
         children = children->next;
     }
 }
 
 /************************************************************************
  *                                                                      *
  *              Dumping XML tree content to an I/O output buffer        *
  *                                                                      *
  ************************************************************************/
 
+static int xmlSaveSwitchEncoding(xmlSaveCtxtPtr ctxt, const char *encoding) {
+    xmlOutputBufferPtr buf = ctxt->buf;
+
+    if ((encoding != NULL) && (buf->encoder == NULL) && (buf->conv == NULL)) {
+        buf->encoder = xmlFindCharEncodingHandler((const char *)encoding);
+        if (buf->encoder == NULL) {
+            xmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL,
+                       (const char *)encoding);
+            return(-1);
+        }
+        buf->conv = xmlBufferCreate();
+        if (buf->conv == NULL) {
+            xmlCharEncCloseFunc(buf->encoder);
+            xmlSaveErrMemory("creating encoding buffer");
+            return(-1);
+        }
+        /*
+         * initialize the state, e.g. if outputting a BOM
+         */
+        xmlCharEncOutFunc(buf->encoder, buf->conv, NULL);
+    }
+    return(0);
+}
+
+static int xmlSaveClearEncoding(xmlSaveCtxtPtr ctxt) {
+    xmlOutputBufferPtr buf = ctxt->buf;
+    xmlOutputBufferFlush(buf);
+    xmlCharEncCloseFunc(buf->encoder);
+    xmlBufferFree(buf->conv);
+    buf->encoder = NULL;
+    buf->conv = NULL;
+    return(0);
+}
+
 #ifdef LIBXML_HTML_ENABLED
 static void
 xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 #endif
 static void xmlNodeListDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 static void xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 void xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur);
 static int xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur);
 
 /**
@@ skipping 161 matching lines @@
                                   ctxt->indent_nr : ctxt->level),
                                  ctxt->indent);
         xmlNodeDumpOutputInternal(ctxt, cur);
         if (ctxt->format) {
             xmlOutputBufferWrite(buf, 1, "\n");
         }
         cur = cur->next;
     }
 }
 
+#ifdef LIBXML_HTML_ENABLED
+/**
+ * xmlNodeDumpOutputInternal:
+ * @cur:  the current node
+ *
+ * Dump an HTML node, recursive behaviour, children are printed too.
+ */
+static int
+htmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
+    const xmlChar *oldenc = NULL;
+    const xmlChar *oldctxtenc = ctxt->encoding;
+    const xmlChar *encoding = ctxt->encoding;
+    xmlOutputBufferPtr buf = ctxt->buf;
+    int switched_encoding = 0;
+    xmlDocPtr doc;
+
+    xmlInitParser();
+
+    doc = cur->doc;
+    if (doc != NULL) {
+        oldenc = doc->encoding;
+        if (ctxt->encoding != NULL) {
+            doc->encoding = BAD_CAST ctxt->encoding;
+        } else if (doc->encoding != NULL) {
+            encoding = doc->encoding;
+        }
+    }
+
+    if ((encoding != NULL) && (doc != NULL))
+        htmlSetMetaEncoding(doc, (const xmlChar *) encoding);
+    if ((encoding == NULL) && (doc != NULL))
+        encoding = htmlGetMetaEncoding(doc);
+    if (encoding == NULL)
+        encoding = BAD_CAST "HTML";
+    if ((encoding != NULL) && (oldctxtenc == NULL) &&
+        (buf->encoder == NULL) && (buf->conv == NULL)) {
+        if (xmlSaveSwitchEncoding(ctxt, (const char*) encoding) < 0) {
+            doc->encoding = oldenc;
+            return(-1);
+        }
+        switched_encoding = 1;
+    }
+    if (ctxt->options & XML_SAVE_FORMAT)
+        htmlNodeDumpFormatOutput(buf, doc, cur,
+                                       (const char *)encoding, 1);
+    else
+        htmlNodeDumpFormatOutput(buf, doc, cur,
+                                       (const char *)encoding, 0);
+    /*
+     * Restore the state of the saving context at the end of the document
+     */
+    if ((switched_encoding) && (oldctxtenc == NULL)) {
+        xmlSaveClearEncoding(ctxt);
+    }
+    if (doc != NULL)
+        doc->encoding = oldenc;
+    return(0);
+}
+#endif
+
 /**
  * xmlNodeDumpOutputInternal:
  * @cur:  the current node
  *
  * Dump an XML node, recursive behaviour, children are printed too.
  */
 static void
 xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
     int format;
     xmlNodePtr tmp;
     xmlChar *start, *end;
     xmlOutputBufferPtr buf;
 
     if (cur == NULL) return;
     buf = ctxt->buf;
     if (cur->type == XML_XINCLUDE_START)
         return;
     if (cur->type == XML_XINCLUDE_END)
         return;
     if ((cur->type == XML_DOCUMENT_NODE) ||
         (cur->type == XML_HTML_DOCUMENT_NODE)) {
         xmlDocContentDumpOutput(ctxt, (xmlDocPtr) cur);
         return;
     }
+#ifdef LIBXML_HTML_ENABLED
+    if (ctxt->options & XML_SAVE_XHTML) {
+        xhtmlNodeDumpOutput(ctxt, cur);
+        return;
+    }
+    if (((cur->type != XML_NAMESPACE_DECL) && (cur->doc != NULL) &&
+         (cur->doc->type == XML_HTML_DOCUMENT_NODE) &&
+         ((ctxt->options & XML_SAVE_AS_XML) == 0)) ||
+        (ctxt->options & XML_SAVE_AS_HTML)) {
+        htmlNodeDumpOutputInternal(ctxt, cur);
+        return;
+    }
+#endif
     if (cur->type == XML_DTD_NODE) {
         xmlDtdDumpOutput(ctxt, (xmlDtdPtr) cur);
         return;
     }
     if (cur->type == XML_DOCUMENT_FRAG_NODE) {
         xmlNodeListDumpOutput(ctxt, cur->children);
         return;
     }
     if (cur->type == XML_ELEMENT_DECL) {
         xmlDumpElementDecl(buf->buffer, (xmlElementPtr) cur);
@@ skipping 153 matching lines @@
     xmlDtdPtr dtd;
     int is_xhtml = 0;
 #endif
     const xmlChar *oldenc = cur->encoding;
     const xmlChar *oldctxtenc = ctxt->encoding;
     const xmlChar *encoding = ctxt->encoding;
     xmlCharEncodingOutputFunc oldescape = ctxt->escape;
     xmlCharEncodingOutputFunc oldescapeAttr = ctxt->escapeAttr;
     xmlOutputBufferPtr buf = ctxt->buf;
     xmlCharEncoding enc;
+    int switched_encoding = 0;
 
     xmlInitParser();
 
+    if ((cur->type != XML_HTML_DOCUMENT_NODE) &&
+        (cur->type != XML_DOCUMENT_NODE))
+         return(-1);
+
     if (ctxt->encoding != NULL) {
         cur->encoding = BAD_CAST ctxt->encoding;
     } else if (cur->encoding != NULL) {
         encoding = cur->encoding;
     } else if (cur->charset != XML_CHAR_ENCODING_UTF8) {
         encoding = (const xmlChar *)
                      xmlGetCharEncodingName((xmlCharEncoding) cur->charset);
     }
 
-    enc = xmlParseCharEncoding((const char*) encoding);
-    if ((encoding != NULL) && (oldctxtenc == NULL) &&
-        (buf->encoder == NULL) && (buf->conv == NULL) &&
-        ((ctxt->options & XML_SAVE_NO_DECL) == 0)) {
-        if ((enc != XML_CHAR_ENCODING_UTF8) &&
-            (enc != XML_CHAR_ENCODING_NONE) &&
-            (enc != XML_CHAR_ENCODING_ASCII)) {
-            /*
-             * we need to switch to this encoding but just for this document
-             * since we output the XMLDecl the conversion must be done to not
-             * generate not well formed documents.
-             */
-            buf->encoder = xmlFindCharEncodingHandler((const char *)encoding);
-            if (buf->encoder == NULL) {
-                xmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL,
-                           (const char *)encoding);
+    if (((cur->type == XML_HTML_DOCUMENT_NODE) &&
+         ((ctxt->options & XML_SAVE_AS_XML) == 0) &&
+         ((ctxt->options & XML_SAVE_XHTML) == 0)) ||
+        (ctxt->options & XML_SAVE_AS_HTML)) {
+#ifdef LIBXML_HTML_ENABLED
+        if (encoding != NULL)
+            htmlSetMetaEncoding(cur, (const xmlChar *) encoding);
+        if (encoding == NULL)
+            encoding = htmlGetMetaEncoding(cur);
+        if (encoding == NULL)
+            encoding = BAD_CAST "HTML";
+        if ((encoding != NULL) && (oldctxtenc == NULL) &&
+            (buf->encoder == NULL) && (buf->conv == NULL)) {
+            if (xmlSaveSwitchEncoding(ctxt, (const char*) encoding) < 0) {
+                cur->encoding = oldenc;
                 return(-1);
             }
-            buf->conv = xmlBufferCreate();
-            if (buf->conv == NULL) {
-                xmlCharEncCloseFunc(buf->encoder);
-                xmlSaveErrMemory("creating encoding buffer");
-                return(-1);
+        }
+        if (ctxt->options & XML_SAVE_FORMAT)
+            htmlDocContentDumpFormatOutput(buf, cur,
+                                           (const char *)encoding, 1);
+        else
+            htmlDocContentDumpFormatOutput(buf, cur,
+                                           (const char *)encoding, 0);
+        if (ctxt->encoding != NULL)
+            cur->encoding = oldenc;
+        return(0);
+#else
+        return(-1);
+#endif
+    } else if ((cur->type == XML_DOCUMENT_NODE) ||
+               (ctxt->options & XML_SAVE_AS_XML) ||
+               (ctxt->options & XML_SAVE_XHTML)) {
+        enc = xmlParseCharEncoding((const char*) encoding);
+        if ((encoding != NULL) && (oldctxtenc == NULL) &&
+            (buf->encoder == NULL) && (buf->conv == NULL) &&
+            ((ctxt->options & XML_SAVE_NO_DECL) == 0)) {
+            if ((enc != XML_CHAR_ENCODING_UTF8) &&
+                (enc != XML_CHAR_ENCODING_NONE) &&
+                (enc != XML_CHAR_ENCODING_ASCII)) {
+                /*
+                 * we need to switch to this encoding but just for this
+                 * document since we output the XMLDecl the conversion
+                 * must be done to not generate not well formed documents.
+                 */
+                if (xmlSaveSwitchEncoding(ctxt, (const char*) encoding) < 0) {
+                    cur->encoding = oldenc;
+                    return(-1);
+                }
+                switched_encoding = 1;
             }
-            /*
-             * initialize the state, e.g. if outputting a BOM
-             */
-            xmlCharEncOutFunc(buf->encoder, buf->conv, NULL);
+            if (ctxt->escape == xmlEscapeEntities)
+                ctxt->escape = NULL;
+            if (ctxt->escapeAttr == xmlEscapeEntities)
+                ctxt->escapeAttr = NULL;
         }
-        if (ctxt->escape == xmlEscapeEntities)
-            ctxt->escape = NULL;
-        if (ctxt->escapeAttr == xmlEscapeEntities)
-            ctxt->escapeAttr = NULL;
+
+
+        /*
+         * Save the XML declaration
+         */
+        if ((ctxt->options & XML_SAVE_NO_DECL) == 0) {
+            xmlOutputBufferWrite(buf, 14, "<?xml version=");
+            if (cur->version != NULL) 
+                xmlBufferWriteQuotedString(buf->buffer, cur->version);
+            else
+                xmlOutputBufferWrite(buf, 5, "\"1.0\"");
+            if (encoding != NULL) {
+                xmlOutputBufferWrite(buf, 10, " encoding=");
+                xmlBufferWriteQuotedString(buf->buffer, (xmlChar *) encoding);
+            }
+            switch (cur->standalone) {
+                case 0:
+                    xmlOutputBufferWrite(buf, 16, " standalone=\"no\"");
+                    break;
+                case 1:
+                    xmlOutputBufferWrite(buf, 17, " standalone=\"yes\"");
+                    break;
+            }
+            xmlOutputBufferWrite(buf, 3, "?>\n");
+        }
+
+#ifdef LIBXML_HTML_ENABLED
+        if (ctxt->options & XML_SAVE_XHTML)
+            is_xhtml = 1;
+        if ((ctxt->options & XML_SAVE_NO_XHTML) == 0) {
+            dtd = xmlGetIntSubset(cur);
+            if (dtd != NULL) {
+                is_xhtml = xmlIsXHTML(dtd->SystemID, dtd->ExternalID);
+                if (is_xhtml < 0) is_xhtml = 0;
+            }
+        }
+#endif
+        if (cur->children != NULL) {
+            xmlNodePtr child = cur->children;
+
+            while (child != NULL) {
+                ctxt->level = 0;
+#ifdef LIBXML_HTML_ENABLED
+                if (is_xhtml)
+                    xhtmlNodeDumpOutput(ctxt, child);
+                else
+#endif
+                    xmlNodeDumpOutputInternal(ctxt, child);
+                xmlOutputBufferWrite(buf, 1, "\n");
+                child = child->next;
+            }
+        }
     }
 
-
-    /*
-     * Save the XML declaration
-     */
-    if ((ctxt->options & XML_SAVE_NO_DECL) == 0) {
-        xmlOutputBufferWrite(buf, 14, "<?xml version=");
-        if (cur->version != NULL) 
-            xmlBufferWriteQuotedString(buf->buffer, cur->version);
-        else
-            xmlOutputBufferWrite(buf, 5, "\"1.0\"");
-        if (encoding != NULL) {
-            xmlOutputBufferWrite(buf, 10, " encoding=");
-            xmlBufferWriteQuotedString(buf->buffer, (xmlChar *) encoding);
-        }
-        switch (cur->standalone) {
-            case 0:
-                xmlOutputBufferWrite(buf, 16, " standalone=\"no\"");
-                break;
-            case 1:
-                xmlOutputBufferWrite(buf, 17, " standalone=\"yes\"");
-                break;
-        }
-        xmlOutputBufferWrite(buf, 3, "?>\n");
-    }
-
-#ifdef LIBXML_HTML_ENABLED
-    if ((ctxt->options & XML_SAVE_NO_XHTML) == 0) {
-        dtd = xmlGetIntSubset(cur);
-        if (dtd != NULL) {
-            is_xhtml = xmlIsXHTML(dtd->SystemID, dtd->ExternalID);
-            if (is_xhtml < 0) is_xhtml = 0;
-        }
-    }
-#endif
-    if (cur->children != NULL) {
-        xmlNodePtr child = cur->children;
-
-        while (child != NULL) {
-            ctxt->level = 0;
-#ifdef LIBXML_HTML_ENABLED
-            if (is_xhtml)
-                xhtmlNodeDumpOutput(ctxt, child);
-            else
-#endif
-                xmlNodeDumpOutputInternal(ctxt, child);
-            xmlOutputBufferWrite(buf, 1, "\n");
-            child = child->next;
-        }
-    }
-    if (ctxt->encoding != NULL)
-        cur->encoding = oldenc;
-    
     /*
      * Restore the state of the saving context at the end of the document
      */
-    if ((encoding != NULL) && (oldctxtenc == NULL) &&
-        ((ctxt->options & XML_SAVE_NO_DECL) == 0)) {
-        if ((enc != XML_CHAR_ENCODING_UTF8) &&
-            (enc != XML_CHAR_ENCODING_NONE) &&
-            (enc != XML_CHAR_ENCODING_ASCII)) {
-            xmlOutputBufferFlush(buf);
-            xmlCharEncCloseFunc(buf->encoder);
-            xmlBufferFree(buf->conv);
-            buf->encoder = NULL;
-            buf->conv = NULL;
-        }
+    if ((switched_encoding) && (oldctxtenc == NULL)) {
+        xmlSaveClearEncoding(ctxt);
         ctxt->escape = oldescape;
         ctxt->escapeAttr = oldescapeAttr;
     }
+    cur->encoding = oldenc;
     return(0);
 }
 
 #ifdef LIBXML_HTML_ENABLED
 /************************************************************************
  *                                                                      *
  *              Functions specific to XHTML serialization               *
  *                                                                      *
  ************************************************************************/
 
@@ skipping 1037 matching lines @@
     if (encoding == NULL)
         encoding = "UTF-8";
 
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = doc;
     ctxt.buf = buf;
     ctxt.level = level;
     ctxt.format = format;
     ctxt.encoding = (const xmlChar *) encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
 
 #ifdef LIBXML_HTML_ENABLED
     dtd = xmlGetIntSubset(doc);
     if (dtd != NULL) {
         is_xhtml = xmlIsXHTML(dtd->SystemID, dtd->ExternalID);
         if (is_xhtml < 0)
             is_xhtml = 0;
     }
 
     if (is_xhtml)
@@ skipping 65 matching lines @@
         return;
     }
 
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = out_doc;
     ctxt.buf = out_buff;
     ctxt.level = 0;
     ctxt.format = format;
     ctxt.encoding = (const xmlChar *) txt_encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
     xmlDocContentDumpOutput(&ctxt, out_doc);
     xmlOutputBufferFlush(out_buff);
     if (out_buff->conv != NULL) {
         *doc_txt_len = out_buff->conv->use;
         *doc_txt_ptr = xmlStrndup(out_buff->conv->content, *doc_txt_len);
     } else {
         *doc_txt_len = out_buff->buffer->use;
         *doc_txt_ptr = xmlStrndup(out_buff->buffer->content, *doc_txt_len);
     }
     (void)xmlOutputBufferClose(out_buff);
@@ skipping 98 matching lines @@
     }
     buf = xmlOutputBufferCreateFile(f, handler);
     if (buf == NULL) return(-1);
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = cur;
     ctxt.buf = buf;
     ctxt.level = 0;
     ctxt.format = format;
     ctxt.encoding = (const xmlChar *) encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
     xmlDocContentDumpOutput(&ctxt, cur);
 
     ret = xmlOutputBufferClose(buf);
     return(ret);
 }
 
 /**
  * xmlDocDump:
  * @f:  the FILE*
  * @cur:  the document
@@ skipping 29 matching lines @@
         xmlOutputBufferClose(buf);
         return(-1);
     }
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = cur;
     ctxt.buf = buf;
     ctxt.level = 0;
     ctxt.format = 0;
     ctxt.encoding = (const xmlChar *) encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
     xmlDocContentDumpOutput(&ctxt, cur);
     ret = xmlOutputBufferClose(buf);
     return(ret);
 }
 
 /**
  * xmlSaveFormatFileTo:
  * @buf:  an output I/O buffer
  * @cur:  the document
  * @encoding:  the encoding if any assuming the I/O layer handles the trancoding
@@ skipping 19 matching lines @@
         xmlOutputBufferClose(buf);
         return(-1);
     }
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = cur;
     ctxt.buf = buf;
     ctxt.level = 0;
     ctxt.format = format;
     ctxt.encoding = (const xmlChar *) encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
     xmlDocContentDumpOutput(&ctxt, cur);
     ret = xmlOutputBufferClose(buf);
     return (ret);
 }
 
 /**
  * xmlSaveFormatFileEnc:
  * @filename:  the filename or URL to output
  * @cur:  the document being saved
  * @encoding:  the name of the encoding to use or NULL.
@@ skipping 34 matching lines @@
      */
     buf = xmlOutputBufferCreateFilename(filename, handler, cur->compression);
     if (buf == NULL) return(-1);
     memset(&ctxt, 0, sizeof(ctxt));
     ctxt.doc = cur;
     ctxt.buf = buf;
     ctxt.level = 0;
     ctxt.format = format;
     ctxt.encoding = (const xmlChar *) encoding;
     xmlSaveCtxtInit(&ctxt);
+    ctxt.options |= XML_SAVE_AS_XML;
 
     xmlDocContentDumpOutput(&ctxt, cur);
 
     ret = xmlOutputBufferClose(buf);
     return(ret);
 }
 
 
 /**
  * xmlSaveFileEnc:
@@ skipping 41 matching lines @@
  */
 int
 xmlSaveFile(const char *filename, xmlDocPtr cur) {
     return(xmlSaveFormatFileEnc(filename, cur, NULL, 0));
 }
 
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 #define bottom_xmlsave
 #include "elfgcchack.h"