2 files changed, 221 insertions, 0 deletions
diff --git a/src/lib/expat/ExpatParser.cxx b/src/lib/expat/ExpatParser.cxx
new file mode 100644
index 000000000..c6b1abe76
--- /dev/null
+++ b/src/lib/expat/ExpatParser.cxx
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "ExpatParser.hxx"
+#include "input/InputStream.hxx"
+#include "util/ASCII.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"
+
+#include <string.h>
+
+static constexpr Domain expat_domain("expat");
+
+void
+ExpatParser::SetError(Error &error)
+{
+	XML_Error code = XML_GetErrorCode(parser);
+	error.Format(expat_domain, int(code), "XML parser failed: %s",
+		     XML_ErrorString(code));
+}
+
+bool
+ExpatParser::Parse(const char *data, size_t length, bool is_final,
+		   Error &error)
+{
+	bool success = XML_Parse(parser, data, length,
+				 is_final) == XML_STATUS_OK;
+	if (!success)
+		SetError(error);
+
+	return success;
+}
+
+bool
+ExpatParser::Parse(InputStream &is, Error &error)
+{
+	assert(is.IsReady());
+
+	while (true) {
+		char buffer[4096];
+		size_t nbytes = is.LockRead(buffer, sizeof(buffer), error);
+		if (nbytes == 0)
+			break;
+
+		if (!Parse(buffer, nbytes, false, error))
+			return false;
+	}
+
+	if (error.IsDefined())
+		return false;
+
+	return Parse("", 0, true, error);
+}
+
+const char *
+ExpatParser::GetAttribute(const XML_Char **atts,
+			  const char *name)
+{
+	for (unsigned i = 0; atts[i] != nullptr; i += 2)
+		if (strcmp(atts[i], name) == 0)
+			return atts[i + 1];
+
+	return nullptr;
+}
+
+const char *
+ExpatParser::GetAttributeCase(const XML_Char **atts,
+			      const char *name)
+{
+	for (unsigned i = 0; atts[i] != nullptr; i += 2)
+		if (StringEqualsCaseASCII(atts[i], name))
+			return atts[i + 1];
+
+	return nullptr;
+}
diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx
new file mode 100644
index 000000000..9d2ac65e5
--- /dev/null
+++ b/src/lib/expat/ExpatParser.hxx
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_EXPAT_HXX
+#define MPD_EXPAT_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#include <expat.h>
+
+class InputStream;
+class Error;
+
+class ExpatParser final {
+	const XML_Parser parser;
+
+public:
+	ExpatParser(void *userData)
+		:parser(XML_ParserCreate(nullptr)) {
+		XML_SetUserData(parser, userData);
+	}
+
+	~ExpatParser() {
+		XML_ParserFree(parser);
+	}
+
+	void SetElementHandler(XML_StartElementHandler start,
+			       XML_EndElementHandler end) {
+		XML_SetElementHandler(parser, start, end);
+	}
+
+	void SetCharacterDataHandler(XML_CharacterDataHandler charhndl) {
+		XML_SetCharacterDataHandler(parser, charhndl);
+	}
+
+	bool Parse(const char *data, size_t length, bool is_final,
+		   Error &error);
+
+	bool Parse(InputStream &is, Error &error);
+
+	gcc_pure
+	static const char *GetAttribute(const XML_Char **atts,
+					const char *name);
+
+	gcc_pure
+	static const char *GetAttributeCase(const XML_Char **atts,
+					    const char *name);
+
+private:
+	void SetError(Error &error);
+};
+
+/**
+ * A specialization of #ExpatParser that provides the most common
+ * callbacks as virtual methods.
+ */
+class CommonExpatParser {
+	ExpatParser parser;
+
+public:
+	CommonExpatParser():parser(this) {
+		parser.SetElementHandler(StartElement, EndElement);
+		parser.SetCharacterDataHandler(CharacterData);
+	}
+
+	bool Parse(const char *data, size_t length, bool is_final,
+		   Error &error) {
+		return parser.Parse(data, length, is_final, error);
+	}
+
+	bool Parse(InputStream &is, Error &error) {
+		return parser.Parse(is, error);
+	}
+
+	gcc_pure
+	static const char *GetAttribute(const XML_Char **atts,
+					const char *name) {
+		return ExpatParser::GetAttribute(atts, name);
+	}
+
+	gcc_pure
+	static const char *GetAttributeCase(const XML_Char **atts,
+					    const char *name) {
+		return ExpatParser::GetAttributeCase(atts, name);
+	}
+
+protected:
+	virtual void StartElement(const XML_Char *name,
+				  const XML_Char **atts) = 0;
+	virtual void EndElement(const XML_Char *name) = 0;
+	virtual void CharacterData(const XML_Char *s, int len) = 0;
+
+private:
+	static void XMLCALL StartElement(void *user_data, const XML_Char *name,
+					 const XML_Char **atts) {
+		CommonExpatParser &p = *(CommonExpatParser *)user_data;
+		p.StartElement(name, atts);
+	}
+
+	static void XMLCALL EndElement(void *user_data, const XML_Char *name) {
+		CommonExpatParser &p = *(CommonExpatParser *)user_data;
+		p.EndElement(name);
+	}
+
+	static void XMLCALL CharacterData(void *user_data,
+					  const XML_Char *s, int len) {
+		CommonExpatParser &p = *(CommonExpatParser *)user_data;
+		p.CharacterData(s, len);
+	}
+};
+
+#endif