s3:lib/util_str: add strlen_m_ext_term() - variant of strlen_m_ext() counting terminator

(cherry picked from commit f7928a0e0b2be27e83bf26644c45ac554c5acec2)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 348b8b2fe1d7eb7eaf74b0fea5329a148a0ac2de..f7bfc2a2c5895ae7482b8d97e5de29f265943b2b 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1540,6 +1540,7 @@ char *strstr_m(const char *src, const char *findstr);
 void strlower_m(char *s);
 void strupper_m(char *s);
 size_t strlen_m_ext(const char *s, const charset_t dst_charset);
+size_t strlen_m_ext_term(const char *s, const charset_t dst_charset);
 size_t strlen_m(const char *s);
 size_t strlen_m_term(const char *s);
 size_t strlen_m_term_null(const char *s);

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index f0eb6e557156a2802426fbd7a92d0c4a3b69b966..3da2b834d20ef32b187e1b00ac52331d93b64fa6 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1521,6 +1521,14 @@ size_t strlen_m_ext(const char *s, const charset_t dst_charset)
        return count;
 }
 
+size_t strlen_m_ext_term(const char *s, const charset_t dst_charset)
+{
+       if (!s) {
+               return 0;
+       }
+       return strlen_m_ext(s, dst_charset) + 1;
+}
+
 /**
  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,