From: Rob Richards <rrichards@php.net>
Date: Wed, 8 Sep 2004 10:16:57 +0000 (+0000)
Subject: MFH: implement php_libxml_xmlCheckUTF8
X-Git-Tag: php-5.0.2RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01310928cbc1c2d629df493ae88807198e9f68e;p=php

MFH: implement php_libxml_xmlCheckUTF8
 - workaround for <= libxml2-2.6.13 function
---

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index f9564c753a..72bef55ad9 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -505,6 +505,32 @@ PHP_FUNCTION(libxml_set_streams_context)
 
 
 /* {{{ Common functions shared by extensions */
+int php_libxml_xmlCheckUTF8(const unsigned char *s)
+{
+	int i;
+	unsigned char c;
+
+	for (i = 0; (c = s[i++]);) {
+		if ((c & 0x80) == 0) {
+		} else if ((c & 0xe0) == 0xc0) {
+			if ((s[i++] & 0xc0) != 0x80) {
+				return 0;
+			}
+		} else if ((c & 0xf0) == 0xe0) {
+			if ((s[i++] & 0xc0) != 0x80 || (s[i++] & 0xc0) != 0x80) {
+				return 0;
+			}
+		} else if ((c & 0xf8) == 0xf0) {
+			if ((s[i++] & 0xc0) != 0x80 || (s[i++] & 0xc0) != 0x80 || (s[i++] & 0xc0) != 0x80) {
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+	}
+	return 1;
+}
+
 int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node export_function)
 {
 	php_libxml_func_handler export_hnd;
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index 5642abc627..9f7c96f2ed 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -80,6 +80,7 @@ void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC
 PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...);
 void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
 void php_libxml_ctx_error(void *ctx, const char *msg, ...);
+PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
 
 #endif /* HAVE_LIBXML */