From f18c9365caaad75c0f4c9e26b89327a75cfcb3e6 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 21 Sep 2006 17:00:07 +0000
Subject: r18787: Fix the strlen_m and strlen_m_term code by merging in (and
 using elsewhere) next_codepoint from Samba4. Jerry please test. Jeremy. (This
 used to be commit ece00b70a4621633f1ac9e576c4bbe332031de09)

---
 source3/lib/util_str.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'source3/lib/util_str.c')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 4619d47388..414a87a562 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1592,6 +1592,58 @@ void strupper_m(char *s)
 	errno = errno_save;
 }
 
+/**
+ Count the number of UCS2 characters in a string. Normally this will
+ be the same as the number of bytes in a string for single byte strings,
+ but will be different for multibyte.
+**/
+
+size_t strlen_m(const char *s)
+{
+	size_t count = 0;
+
+	if (!s) {
+		return 0;
+	}
+
+	while (*s && !(((uint8_t)*s) & 0x80)) {
+		s++;
+		count++;
+	}
+
+	if (!*s) {
+		return count;
+	}
+
+	while (*s) {
+		size_t c_size;
+		codepoint_t c = next_codepoint(s, &c_size);
+		if (c < 0x10000) {
+			/* Unicode char fits into 16 bits. */
+			count += 1;
+		} else {
+			/* Double-width unicode char - 32 bits. */
+			count += 2;
+		}
+		s += c_size;
+	}
+
+	return count;
+}
+
+/**
+ Count the number of UCS2 characters in a string including the null
+ terminator.
+**/
+
+size_t strlen_m_term(const char *s)
+{
+	if (!s) {
+		return 0;
+	}
+	return strlen_m(s) + 1;
+}
+
 /**
  Return a RFC2254 binary string representation of a buffer.
  Used in LDAP filters.
-- 
cgit