parser: New input API

Provide a new set of functions to create xmlParserInputs. These can be
used for the document entity or from external entity loaders.

- Don't require xmlParserInputBuffer.
- All functions take a base URI.
- All functions take an encoding as string.
- xmlNewInputURL also takes a public ID.
- xmlNewInputMemory takes a size_t.
- Optimization hints for memory buffers.

Improve documentation.

Only call xmlInitParser before allocating a new parser context.

Call xmlCtxtUseOptions as early as possible.

Author: nwellnhof

HTMLparser.c

@@ -246,6 +246,8 @@ XMLPUBFUN htmlDocPtr
 					 const char *URL,
 					 const char *encoding,
 					 int options);
+XMLPUBFUN htmlDocPtr
+		htmlCtxtParseDocument	(htmlParserCtxtPtr ctxt);
 XMLPUBFUN htmlDocPtr
 		htmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
 					 const xmlChar *cur,

include/libxml/HTMLparser.h

@@ -1309,6 +1309,8 @@ XMLPUBFUN xmlDocPtr
 					 const char *URL,
 					 const char *encoding,
 					 int options);
+XMLPUBFUN xmlDocPtr
+		xmlCtxtParseDocument	(xmlParserCtxtPtr ctxt);
 XMLPUBFUN xmlDocPtr
 		xmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
 					 const xmlChar *cur,
@@ -1342,6 +1344,46 @@ XMLPUBFUN xmlDocPtr
 					 const char *encoding,
 					 int options);
 
+/**
+ * New input API (2.9.13)
+ */
+
+#define XML_INPUT_BUF_STATIC		(1u << 1)
+#define XML_INPUT_BUF_ZERO_TERMINATED	(1u << 2)
+
+XMLPUBFUN xmlParserInputPtr
+		xmlNewInputURL		(xmlParserCtxtPtr ctxt,
+					 const char *url,
+					 const char *publicId,
+					 const char *encoding,
+					 int flags);
+XMLPUBFUN xmlParserInputPtr
+		xmlNewInputMemory	(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const void *mem, size_t size,
+					 const char *encoding,
+					 int flags);
+XMLPUBFUN xmlParserInputPtr
+		xmlNewInputString	(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const char *str,
+					 const char *encoding,
+					 int flags);
+XMLPUBFUN xmlParserInputPtr
+		xmlNewInputFd		(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 int fd,
+					 const char *encoding,
+					 int flags);
+XMLPUBFUN xmlParserInputPtr
+		xmlNewInputIO		(xmlParserCtxtPtr ctxt,
+					 const char *url,
+					 xmlInputReadCallback ioRead,
+					 xmlInputCloseCallback ioClose,
+					 void *ioCtxt,
+					 const char *encoding,
+					 int flags);
+
 /*
  * Library wide options
  */

include/libxml/parser.h

@@ -17,8 +17,12 @@ xmlNoNetExists(const char *filename);
 XML_HIDDEN int
 xmlParserInputBufferCreateFilenameSafe(const char *URI, xmlCharEncoding enc,
                                        xmlParserInputBufferPtr *out);
+
+XML_HIDDEN xmlParserInputBufferPtr
+xmlNewInputBufferString(const char *str, int flags);
 XML_HIDDEN xmlParserInputBufferPtr
-xmlParserInputBufferCreateString(const xmlChar *str);
+xmlNewInputBufferMemory(const void *mem, size_t size, int flags,
+                        xmlCharEncoding enc);
 
 #ifdef LIBXML_OUTPUT_ENABLED
 XML_HIDDEN xmlOutputBufferPtr

include/private/io.h

@@ -83,4 +83,8 @@ xmlParserNsUpdateSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix,
 XML_HIDDEN void *
 xmlParserNsLookupSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix);
 
+XML_HIDDEN xmlParserInputPtr
+xmlNewInputPush(xmlParserCtxtPtr ctxt, const char *url,
+                const char *chunk, int size, const char *encoding);
+
 #endif /* XML_PARSER_H_PRIVATE__ */