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

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5e88476e4435d5d42877dbdc3d845c30366533ac..058424359dd4f209793344c8de5b278c4501fbf1 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1435,6 +1435,8 @@ void strlower_m(char *s);
 void strupper_m(char *s);
 size_t strlen_m_ext(const char *s, const charset_t src_charset,
                    const charset_t dst_charset);
+size_t strlen_m_ext_term(const char *s, const charset_t src_charset,
+                        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 27147365cd5a2569bab77a5dc33595ea7125fa24..508050d892d9f9c78532ccfa17cf746e9f87f1a3 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1523,6 +1523,15 @@ size_t strlen_m_ext(const char *s, const charset_t src_charset,
        return count;
 }
 
+size_t strlen_m_ext_term(const char *s, const charset_t src_charset,
+                        const charset_t dst_charset)
+{
+       if (!s) {
+               return 0;
+       }
+       return strlen_m_ext(s, src_charset, dst_charset) + 1;
+}
+
 /**
  * Calculate the number of 16-bit units that would bee needed to convert
  * the input string which is expected to be in CH_UNIX encoding to UTF16.