From: Günther Deschner <gd@samba.org>
Date: Thu, 15 Jan 2009 23:25:31 +0000 (+0100)
Subject: lib: add strlen_m_term_null from s3.
X-Git-Tag: samba-4.0.0alpha6~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87fec1450f1ae78d9aea58f55bd22dda3d1f362a;p=thirdparty%2Fsamba.git

lib: add strlen_m_term_null from s3.

Guenther
---

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index b69bef2d616..f027beb8db8 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -84,6 +84,7 @@ struct smb_iconv_convenience;
 
 char *strchr_m(const char *s, char c);
 size_t strlen_m_term(const char *s);
+size_t strlen_m_term_null(const char *s);
 size_t strlen_m(const char *s);
 char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength);
 void string_replace_m(char *s, char oldc, char newc);
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index 86a76f831ec..41b9c94cbb1 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -297,6 +297,25 @@ _PUBLIC_ size_t strlen_m_term(const char *s)
 	return strlen_m(s) + 1;
 }
 
+/*
+ * Weird helper routine for the winreg pipe: If nothing is around, return 0,
+ * if a string is there, include the terminator.
+ */
+
+_PUBLIC_ size_t strlen_m_term_null(const char *s)
+{
+	size_t len;
+	if (!s) {
+		return 0;
+	}
+	len = strlen_m(s);
+	if (len == 0) {
+		return 0;
+	}
+
+	return len+1;
+}
+
 /**
  Strchr and strrchr_m are a bit complex on general multi-byte strings. 
 **/