X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Fstr.h;h=36943715a4d48660b93f1d013461c99991682a17;hb=ee869a42bc5677da8e3602ec1947af1736786648;hp=d9b1f9e68728d87e938c7a27e79f299c403c214f;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199;p=apps%2Fmadmutt.git

diff --git a/lib-lib/str.h b/lib-lib/str.h
index d9b1f9e..3694371 100644
--- a/lib-lib/str.h
+++ b/lib-lib/str.h
@@ -1,17 +1,18 @@
 /*
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
  *
  *  Copyright © 2006 Pierre Habouzit
  */
@@ -24,12 +25,31 @@
 
 #include "mem.h"
 
+#define NONULL(x) (x?x:"")
+
 static inline ssize_t m_strlen(const char *s) {
     return s ? strlen(s) : 0;
 }
 
-static inline char* m_strdup(const char *s) {
+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));
 }
 
+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 */