From c071301a77b1987526f42c8877336a1f6a1bfa7e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 23 Nov 2003 10:50:52 +0000
Subject: Add a strlen_m_term() function for returning the length of a string
 including the termination.  Using value(strlen_m((r->name)+1)*2) gives the
 wrong answer for the NULL string. (This used to be commit
 7ae329e6630a07d29f83b6dd4572d26ab8a18c71)

---
 source4/lib/util_str.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'source4/lib')

diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index 285b0cc02e..6005a3e49a 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -1091,6 +1091,21 @@ size_t strlen_m(const char *s)
 	return count + strlen_w(tmpbuf);
 }
 
+/**
+   Work out the number of multibyte chars in a string, including the NULL
+   terminator.
+**/
+size_t strlen_m_term(const char *s)
+{
+	size_t count = 0;
+
+	if (!s) {
+		return 0;
+	}
+
+	return strlen_m(s) + 1;
+}
+
 /**
  Convert a string to upper case.
 **/
-- 
cgit