diff options
| -rw-r--r-- | lib/util/charset/charset.h | 1 | ||||
| -rw-r--r-- | lib/util/charset/util_unistr.c | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index b69bef2d61..f027beb8db 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 86a76f831e..41b9c94cbb 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. **/ |