X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fstr.h;h=4ef9d485914c2579d4f2b669475688286bef8041;hp=d21e120cb3a7b04ef7c75b57eda3f266000b901a;hb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7;hpb=3e611c4b53a33408955152e1c9336f8643ea096e

diff --git a/lib-lib/str.h b/lib-lib/str.h
index d21e120..4ef9d48 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,19 @@ 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);
+ssize_t m_strncpy(char *dst, ssize_t n, const char *src, ssize_t l);
+
+static inline ssize_t m_strcat(char *dst, ssize_t n, const char *src) {
+    ssize_t dlen = m_strnlen(dst, n - 1);
+    return dlen + m_strcpy(dst + dlen, n - dlen, src);
+}
+
+static inline ssize_t
+m_strncat(char *dst, ssize_t n, const char *src, ssize_t l) {
+    ssize_t dlen = m_strnlen(dst, n - 1);
+    return dlen + m_strncpy(dst + dlen, n - dlen, src, l);
+}
+
 #endif /* MUTT_LIB_LIB_STR_H */