X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Fstr.h;h=55a89b9c73734ef74e69dbb8dbbfb988497665dd;hb=c5ca8b7eaa727392811813926cda758bceef80f1;hp=8850830a501cd691e8bede3745f00608996b84eb;hpb=b07d69b15852a06183f7b2298436e18150c36958;p=apps%2Fmadmutt.git

diff --git a/lib-lib/str.h b/lib-lib/str.h
index 8850830..55a89b9 100644
--- a/lib-lib/str.h
+++ b/lib-lib/str.h
@@ -21,11 +21,46 @@
 #define MUTT_LIB_LIB_STR_H
 
 #include <string.h>
+#include <ctype.h>
+
 #include "../lib/str.h"
 
 #include "mem.h"
 
+#define HUGE_STRING     5120
+#define LONG_STRING     1024
+#define STRING          256
+#define SHORT_STRING    128
+
 #define NONULL(x) (x?x:"")
+#define ISSPACE(c) isspace((unsigned char)c)
+
+extern unsigned char const __m_strdigits[128];
+extern signed char const __m_b64digits[128];
+extern char const __m_b64chars[64];
+
+extern char const __m_b36chars_lower[36];
+extern char const __m_b36chars_upper[36];
+
+/****************************************************************************/
+/* char related                                                             */
+/****************************************************************************/
+
+static inline int hexval(int c) {
+    return !(c & ~127) && __m_strdigits[c] < 16 ? __m_strdigits[c] : -1;
+}
+
+static inline int base64val(int c) {
+    return (c & ~127) ? -1 : __m_b64digits[c];
+}
+
+/****************************************************************************/
+/* length related                                                           */
+/****************************************************************************/
+
+static inline int m_strisempty(const char *s) {
+    return !s || !*s;
+}
 
 static inline ssize_t m_strlen(const char *s) {
     return s ? strlen(s) : 0;
@@ -36,16 +71,40 @@ static inline ssize_t m_strnlen(const char *s, ssize_t n) {
     return p ? p - s : n;
 }
 
+/****************************************************************************/
+/* comparisons                                                              */
+/****************************************************************************/
+
+static inline int m_strcmp(const char *a, const char *b) {
+    return strcmp(NONULL(a), NONULL(b));
+}
+
+static inline int m_strcasecmp(const char *a, const char *b) {
+    return strcasecmp(NONULL(a), NONULL(b));
+}
+
+static inline int m_strncmp(const char *a, const char *b, size_t n) {
+    return strncmp (NONULL(a), NONULL(b), n);
+}
+
+static inline int m_strncasecmp(const char *a, const char *b, size_t n) {
+    return strncasecmp(NONULL(a), NONULL(b), n);
+}
+
+/****************************************************************************/
+/* making copies                                                            */
+/****************************************************************************/
+
 static inline char *m_strdup(const char *s) {
     ssize_t len = m_strlen(s);
     return len ? p_dup(s, len + 1) : NULL;
 }
 
-static inline int m_strcmp(const char *a, const char *b) {
-    return strcmp(NONULL(a), NONULL(b));
+static inline char *m_strreplace(char **p, const char *s) {
+    p_delete(p);
+    return (*p = m_strdup(s));
 }
 
-
 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);
 
@@ -60,4 +119,17 @@ m_strncat(char *dst, ssize_t n, const char *src, ssize_t l) {
     return dlen + m_strncpy(dst + dlen, n - dlen, src, l);
 }
 
+/****************************************************************************/
+/* parsing related                                                          */
+/****************************************************************************/
+
+static inline const char *skipspaces(const char *s) {
+    while (*s && isspace((unsigned char)*s))
+        s++;
+    return s;
+}
+static inline char *vskipspaces(const char *s) {
+    return (char *)skipspaces(s);
+}
+
 #endif /* MUTT_LIB_LIB_STR_H */