X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Fstr.h;h=36943715a4d48660b93f1d013461c99991682a17;hb=ee869a42bc5677da8e3602ec1947af1736786648;hp=d21e120cb3a7b04ef7c75b57eda3f266000b901a;hpb=3e611c4b53a33408955152e1c9336f8643ea096e;p=apps%2Fmadmutt.git diff --git a/lib-lib/str.h b/lib-lib/str.h index d21e120..3694371 100644 --- a/lib-lib/str.h +++ b/lib-lib/str.h @@ -31,6 +31,11 @@ static inline ssize_t m_strlen(const char *s) { return s ? strlen(s) : 0; } +static inline ssize_t m_strnlen(const char *s, ssize_t n) { + const char *p = memchr(s, '\0', n); + return p ? p - s : n; +} + static inline char *m_strdup(const char *s) { return p_dupstr(s, m_strlen(s)); } @@ -39,4 +44,12 @@ static inline int m_strcmp(const char *a, const char *b) { return strcmp(NONULL(a), NONULL(b)); } + +ssize_t m_strcpy(char *dst, ssize_t n, const char *src); + +static inline ssize_t m_strcat(char *dst, ssize_t n, const char *src) { + ssize_t dlen = m_strnlen(dst, n); + return dlen + m_strcpy(dst + dlen, n - dlen, src); +} + #endif /* MUTT_LIB_LIB_STR_H */