support for unknown encoding in expat wrapper

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

2 files changed, 12 insertions, 0 deletions

diff --git a/include/opkele/expat.h b/include/opkele/expat.h
index 3ab1630..21be003 100644
--- a/include/opkele/expat.h
+++ b/include/opkele/expat.h
@@ -1,91 +1,94 @@
 #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 int unknown_encoding(const XML_Char * /* n */,XML_Encoding * /* i */) { return XML_STATUS_ERROR; }
+		void set_unknown_encoding_handler();
+
 		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/expat.cc b/lib/expat.cc
index c4dab7e..fb58a9a 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -1,97 +1,106 @@
 #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;
 	    return *this;
 	}
 
 	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);
 	}
 
+	static int _unknown_encoding(void *ehd,const XML_Char *n,XML_Encoding *i) {
+	    return ((expat_t*)ehd)->unknown_encoding(n,i);
+	}
+
+	void expat_t::set_unknown_encoding_handler() {
+	    assert(_x);
+	    XML_SetUnknownEncodingHandler(_x,_unknown_encoding,this);
+	}
+
     }
 
 }