added a trivial expat wrapper

Signed-off-by: Michael Krelin <hacker@klever.net>

6 files changed, 207 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 48a5efb..2b94b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,128 +1,141 @@
 AC_INIT([libopkele], [0.4], [libopkele-bugs@klever.net])
 AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
 AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_INSTALL
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
 AC_HEADER_STDC
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
 
 AC_MSG_CHECKING([for source tree version])
 if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then
  PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)"
  test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \
   -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}"
  ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty"
 else
  PACKAGE_SRC_VERSION="$PACKAGE_VERSION"
 fi
 AC_MSG_RESULT([$PACKAGE_SRC_VERSION])
 AC_SUBST([PACKAGE_SRC_VERSION])
 AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version])
 
 PKG_CHECK_MODULES([OPENSSL],[openssl],,[
  AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
 ])
 
 WANT_KONFORKA="yes"
 AC_ARG_ENABLE([konforka],
  AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]),
  [
   test "${enableval}" = "no" && WANT_KONFORKA="no"
  ]
 )
 if test "${WANT_KONFORKA}" = "yes" ; then
  PKG_CHECK_MODULES([KONFORKA],[konforka],[
   AC_SUBST([KONFORKA_CFLAGS])
   AC_SUBST([KONFORKA_LIBS])
   AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library])
   AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library])
   AC_SUBST([KONFORKA_KONFORKA],[konforka])
  ],[true])
 fi
 
 WANT_DOXYGEN="yes"
 AC_ARG_ENABLE([doxygen],
  AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
  [
   test "${enableval}" = "no" && WANT_DOXYGEN="no"
  ]
 )
 if test "${WANT_DOXYGEN}" = "yes" ; then
  AC_WITH_DOXYGEN
  AC_WITH_DOT
 else
  AM_CONDITIONAL([HAVE_DOXYGEN],[false])
  AM_CONDITIONAL([HAVE_DOT],[false])
 fi
 
 LIBCURL_CHECK_CONFIG(,,,[
  AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/])
 ])
 
+AC_CHECK_HEADER([expat.h],[
+ AC_CHECK_LIB([expat],[XML_ParserCreate],[
+  EXPAT_LIBS=-lexpat
+  EXPAT_CFLAGS=
+  AC_SUBST([EXPAT_LIBS])
+  AC_SUBST([EXPAT_CFLAGS])
+ ],[
+  AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
+ ])
+],[
+ AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
+])
+
 if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then
  AC_SUBST([PCRE_CFLAGS])
  AC_SUBST([PCRE_LIBS])
  :
 else
  PKG_CHECK_MODULES([PCRE],[libpcre],,[
   AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/])
  ])
 fi
 
 curl_ssl_verify_host="true"
 AC_ARG_ENABLE([ssl-verify-host],
  AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]),
  [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ]
 )
 ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host])
 
 curl_ssl_verify_peer="true"
 AC_ARG_ENABLE([ssl-verify-peer],
  AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]),
  [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ]
 )
 ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity])
 
 postels_law=true
 AC_ARG_ENABLE([postels-law],
  AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]),
  [ test "${enableval}" = "no" && postels_law=false ]
 )
 $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law])
 
 AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory])
 
 nitpick=false
 AC_ARG_ENABLE([nitpicking],
  AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]),
  [ test "$enableval" = "no" || nitpick=true ]
 )
 if $nitpick ; then
  CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \
   -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \
   -Wredundant-decls -ansi"
  # -Wlogical-op -Wmissing-noreturn 
  C_NITPICK="$CPP_NITPICK"
  CXX_NITPICK="$C_NITPICK"
 
  CPPFLAGS="$CPPFLAGS $CPP_NITPICK"
  CFLAGS="$CFLAGS $C_NITPICK"
  CXXFLAGS="$CXXFLAGS $CXX_NITPICK"
 fi
 
 AC_CONFIG_FILES([
  Makefile
   libopkele.pc
   Doxyfile
  include/Makefile
  lib/Makefile
  test/Makefile
 ])
 AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
index b31786d..0385cfb 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,17 +1,17 @@
 nobase_include_HEADERS = \
 	opkele/acconfig.h \
 	opkele/opkele-config.h \
 	opkele/types.h \
 	opkele/association.h \
 	opkele/exception.h \
 	opkele/server.h \
 	opkele/consumer.h \
 	opkele/extension.h \
 	opkele/sreg.h \
 	opkele/extension_chain.h \
 	opkele/xconsumer.h \
 	opkele/xserver.h
 EXTRA_DIST = \
 	opkele/data.h \
 	opkele/util.h \
-	opkele/curl.h
+	opkele/curl.h opkele/expat.h
diff --git a/include/opkele/expat.h b/include/opkele/expat.h
new file mode 100644
index 0000000..60c41ac
--- a/dev/null
+++ b/include/opkele/expat.h
@@ -0,0 +1,91 @@
+#ifndef __OPKELE_EXPAT_H
+#define __OPKELE_EXPAT_H
+
+#include <cassert>
+#include <expat.h>
+
+namespace opkele {
+
+    namespace util {
+
+	class expat_t {
+	    public:
+		XML_Parser _x;
+
+		expat_t() : _x(0) { }
+		expat_t(XML_Parser x) : _x(x) { }
+		virtual ~expat_t() throw();
+
+		expat_t& operator=(XML_Parser x);
+
+		operator const XML_Parser(void) const { return _x; }
+		operator XML_Parser(void) { return _x; }
+
+		inline bool parse(const char *s,int len,bool final=false) {
+		    assert(_x);
+		    return XML_Parse(_x,s,len,final);
+		}
+
+		virtual void start_element(const XML_Char *n,const XML_Char **a) { }
+		virtual void end_element(const XML_Char *n) { }
+		void set_element_handler();
+
+		virtual void character_data(const XML_Char *s,int l) { }
+		void set_character_data_handler();
+
+		virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { }
+		void set_processing_instruction_handler();
+
+		virtual void comment(const XML_Char *d) { }
+		void set_comment_handler();
+
+		virtual void start_cdata_section() { }
+		virtual void end_cdata_section() { }
+		void set_cdata_section_handler();
+
+		virtual void default_handler(const XML_Char *s,int l) { }
+		void set_default_handler();
+		void set_default_handler_expand();
+
+		virtual void start_namespace_decl(const XML_Char *p,const XML_Char *u) { }
+		virtual void end_namespace_decl(const XML_Char *p) { }
+		void set_namespace_decl_handler();
+
+		inline enum XML_Error get_error_code() {
+		    assert(_x); return XML_GetErrorCode(_x); }
+		static inline const XML_LChar *error_string(XML_Error c) {
+		    return XML_ErrorString(c); }
+
+		inline long get_current_byte_index() {
+		    assert(_x); return XML_GetCurrentByteIndex(_x); }
+		inline int get_current_line_number() {
+		    assert(_x); return XML_GetCurrentLineNumber(_x); }
+		inline int get_current_column_number() {
+		    assert(_x); return XML_GetCurrentColumnNumber(_x); }
+
+		inline void set_user_data() {
+		    assert(_x); XML_SetUserData(_x,this); }
+
+		inline bool set_base(const XML_Char *b) {
+		    assert(_x); return XML_SetBase(_x,b); }
+		inline const XML_Char *get_base() {
+		    assert(_x); return XML_GetBase(_x); }
+
+		inline int get_specified_attribute_count() {
+		    assert(_x); return XML_GetSpecifiedAttributeCount(_x); }
+
+		inline bool set_param_entity_parsing(enum XML_ParamEntityParsing c) {
+		    assert(_x); return XML_SetParamEntityParsing(_x,c); }
+
+		inline static XML_Parser parser_create(const XML_Char *e=0) {
+		    return XML_ParserCreate(e); }
+		inline static XML_Parser parser_create_ns(const XML_Char *e=0,XML_Char s='\t') {
+		    return XML_ParserCreateNS(e,s); }
+
+	};
+
+    }
+
+}
+
+#endif /* __OPKELE_EXPAT_H */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0fe705a..7309353 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,28 +1,29 @@
 lib_LTLIBRARIES = libopkele.la
 
+DEFAULT_INCLUDES = -I${top_builddir}
 INCLUDES = \
 	   -I${top_srcdir}/include/ \
 	   ${KONFORKA_CFLAGS} \
 	   ${OPENSSL_CFLAGS} \
 	   ${LIBCURL_CPPFLAGS} \
-	   ${PCRE_CFLAGS}
+	   ${PCRE_CFLAGS} ${EXPAT_CFLAGS}
 libopkele_la_LIBADD = \
 	${LIBCURL} \
-	${PCRE_LIBS} \
+	${PCRE_LIBS} ${EXPAT_LIBS} \
 	${OPENSSL_LIBS} \
 	${KONFORKA_LIBS}
 
 libopkele_la_SOURCES = \
 		       params.cc \
 		       util.cc \
 		       server.cc \
 		       secret.cc \
 		       data.cc \
 		       consumer.cc \
 		       exception.cc \
 		       extension.cc \
 		       sreg.cc \
 		       extension_chain.cc \
-		       curl.cc
+		       curl.cc expat.cc
 libopkele_la_LDFLAGS = \
 	-version-info 2:0:0
diff --git a/lib/expat.cc b/lib/expat.cc
new file mode 100644
index 0000000..fa6fdde
--- a/dev/null
+++ b/lib/expat.cc
@@ -0,0 +1,96 @@
+#include <opkele/expat.h>
+
+namespace opkele {
+
+    namespace util {
+
+	expat_t::~expat_t() throw() {
+	    if(_x)
+		XML_ParserFree(_x);
+	}
+
+	expat_t& expat_t::operator=(XML_Parser x) {
+	    if(_x)
+		XML_ParserFree(_x);
+	    _x = x;
+	}
+
+	static void _start_element(void* ud,const XML_Char *n,const XML_Char **a) {
+	    ((expat_t*)ud)->start_element(n,a);
+	}
+	static void _end_element(void *ud,const XML_Char *n) {
+	    ((expat_t*)ud)->end_element(n);
+	}
+
+	void expat_t::set_element_handler() {
+	    assert(_x);
+	    XML_SetElementHandler(_x,_start_element,_end_element);
+	}
+
+	static void _character_data(void *ud,const XML_Char *s,int l) {
+	    ((expat_t*)ud)->character_data(s,l);
+	}
+
+	void expat_t::set_character_data_handler() {
+	    assert(_x);
+	    XML_SetCharacterDataHandler(_x,_character_data);
+	}
+
+	static void _processing_instruction(void *ud,const XML_Char *t,const XML_Char *d) {
+	    ((expat_t*)ud)->processing_instruction(t,d);
+	}
+
+	void expat_t::set_processing_instruction_handler() {
+	    assert(_x);
+	    XML_SetProcessingInstructionHandler(_x,_processing_instruction);
+	}
+
+	static void _comment(void *ud,const XML_Char *d) {
+	    ((expat_t*)ud)->comment(d);
+	}
+
+	void expat_t::set_comment_handler() {
+	    assert(_x);
+	    XML_SetCommentHandler(_x,_comment);
+	}
+
+	static void _start_cdata_section(void *ud) {
+	    ((expat_t*)ud)->start_cdata_section();
+	}
+	static void _end_cdata_section(void *ud) {
+	    ((expat_t*)ud)->end_cdata_section();
+	}
+
+	void expat_t::set_cdata_section_handler() {
+	    assert(_x);
+	    XML_SetCdataSectionHandler(_x,_start_cdata_section,_end_cdata_section);
+	}
+
+	static void _default_handler(void *ud,const XML_Char *s,int l) {
+	    ((expat_t*)ud)->default_handler(s,l);
+	}
+
+	void expat_t::set_default_handler() {
+	    assert(_x);
+	    XML_SetDefaultHandler(_x,_default_handler);
+	}
+	void expat_t::set_default_handler_expand() {
+	    assert(_x);
+	    XML_SetDefaultHandlerExpand(_x,_default_handler);
+	}
+
+	static void _start_namespace_decl(void *ud,const XML_Char *p,const XML_Char *u) {
+	    ((expat_t*)ud)->start_namespace_decl(p,u);
+	}
+	static void _end_namespace_decl(void *ud,const XML_Char *p) {
+	    ((expat_t*)ud)->end_namespace_decl(p);
+	}
+
+	void expat_t::set_namespace_decl_handler() {
+	    assert(_x);
+	    XML_SetNamespaceDeclHandler(_x,_start_namespace_decl,_end_namespace_decl);
+	}
+
+    }
+
+}
diff --git a/libopkele.pc.in b/libopkele.pc.in
index bc67362..0a95e96 100644
--- a/libopkele.pc.in
+++ b/libopkele.pc.in
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
 Name: libopkele
 Description: C++ implementation of OpenID protocol
 Version: @VERSION@
 Requires: openssl libpcre @KONFORKA_KONFORKA@
-Cflags: -I${includedir} @LIBCURL_CPPFLAGS@ @PCRE_CFLAGS@
-Libs: -L${libdir} -lopkele @LIBCURL@ @PCRE_LIBS@
+Cflags: -I${includedir} @LIBCURL_CPPFLAGS@ @PCRE_CFLAGS@ @EXPAT_CFLAGS@
+Libs: -L${libdir} -lopkele @LIBCURL@ @PCRE_LIBS@ @EXPAT_LIBS@