X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fstr.h;h=a5791c31eda5452470b5a57c715251df95449f73;hp=29b8817fe56bf95432f9ab94ba5b4632b870e3cf;hb=284454918cc95058b026d057195eaa5279135c36;hpb=b36dc16c428cc2b1371bb99c0581aa014f302791

diff --git a/lib-lib/str.h b/lib-lib/str.h
index 29b8817..a5791c3 100644
--- a/lib-lib/str.h
+++ b/lib-lib/str.h
@@ -16,17 +16,14 @@
  *
  *  Copyright © 2006 Pierre Habouzit
  */
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
+ */
 
 #ifndef MUTT_LIB_LIB_STR_H
 #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
@@ -43,7 +40,7 @@ extern char const __m_b36chars_lower[36];
 extern char const __m_b36chars_upper[36];
 
 /****************************************************************************/
-/* char related                                                             */
+/* conversions                                                              */
 /****************************************************************************/
 
 static inline int hexval(int c) {
@@ -54,6 +51,25 @@ static inline int base64val(int c) {
     return (c & ~127) ? -1 : __m_b64digits[c];
 }
 
+static inline void m_strtolower(char *p) {
+    for (; *p; p++)
+        *p = tolower((unsigned char)*p);
+}
+
+static inline int ascii_toupper(int c) {
+    if ('a' <= c && c <= 'z')
+        return c & ~32;
+
+    return c;
+}
+
+static inline int ascii_tolower(int c) {
+    if ('A' <= c && c <= 'Z')
+        return c | 32;
+
+    return c;
+}
+
 /****************************************************************************/
 /* length related                                                           */
 /****************************************************************************/
@@ -83,14 +99,17 @@ 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) {
+static inline int m_strncmp(const char *a, const char *b, ssize_t n) {
     return strncmp (NONULL(a), NONULL(b), n);
 }
 
-static inline int m_strncasecmp(const char *a, const char *b, size_t n) {
+static inline int m_strncasecmp(const char *a, const char *b, ssize_t n) {
     return strncasecmp(NONULL(a), NONULL(b), n);
 }
 
+int ascii_strcasecmp(const char *a, const char *b);
+int ascii_strncasecmp(const char *a, const char *b, ssize_t n);
+
 /****************************************************************************/
 /* making copies                                                            */
 /****************************************************************************/
@@ -100,6 +119,15 @@ static inline char *m_strdup(const char *s) {
     return len ? p_dup(s, len + 1) : NULL;
 }
 
+static inline char *m_substrdup(const char *s, const char *end) {
+    return p_dupstr(s, end ? end - s : m_strlen(s));
+}
+
+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);
 
@@ -118,6 +146,18 @@ m_strncat(char *dst, ssize_t n, const char *src, ssize_t l) {
 /* parsing related                                                          */
 /****************************************************************************/
 
+static inline const char *m_strchrnul(const char *s, int c) {
+    while (*s && *s != c)
+        s++;
+    return s;
+}
+
+static inline const char *m_strnextsp(const char *s) {
+    while (*s && !isspace((unsigned char)*s))
+        s++;
+    return s;
+}
+
 static inline const char *skipspaces(const char *s) {
     while (*s && isspace((unsigned char)*s))
         s++;
@@ -127,4 +167,18 @@ static inline char *vskipspaces(const char *s) {
     return (char *)skipspaces(s);
 }
 
+char *m_strrtrim(char *s);
+
+/****************************************************************************/
+/* search                                                                   */
+/****************************************************************************/
+
+const char *
+m_stristrn(const char *haystack, const char *needle, ssize_t nlen);
+
+static inline const char *
+m_stristr(const char *haystack, const char *needle) {
+    return m_stristrn(haystack, needle, m_strlen(needle));
+}
+
 #endif /* MUTT_LIB_LIB_STR_H */