X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Fstr.c;h=e40e614dbc9e773eab5d6b3f233bace88b54a5e9;hp=79bb46932e719096fd8216d5e4c9b1db94fc8acb;hb=b21e95b6f27174909ff28e8e95c13bec01e87f28;hpb=8b7093aff990803877b20e86826f0693817cbcaf

diff --git a/lib/str.c b/lib/str.c
index 79bb469..e40e614 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -12,24 +12,18 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "str.h"
+#include <lib-lib/mem.h>
 
-#include "mem.h"
+#include "str.h"
 
-char *safe_strdup (const char *s)
+char *str_dup (const char *s)
 {
-  char *p;
-  size_t l;
-
   if (!s || !*s)
-    return 0;
-  l = mutt_strlen (s) + 1;
-  p = (char *) safe_malloc (l);
-  memcpy (p, s, l);
-  return (p);
+      return NULL;
+  return p_dupstr(s, str_len(s));
 }
 
-char *safe_strcat (char *d, size_t l, const char *s)
+char *str_cat (char *d, size_t l, const char *s)
 {
   char *p = d;
 
@@ -48,7 +42,7 @@ char *safe_strcat (char *d, size_t l, const char *s)
   return p;
 }
 
-char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
+char *str_ncat (char *d, size_t l, const char *s, size_t sl)
 {
   char *p = d;
 
@@ -67,21 +61,51 @@ char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
   return p;
 }
 
-void mutt_str_replace (char **p, const char *s)
+int str_cmp (const char *a, const char *b)
 {
-  FREE (p);
-  *p = safe_strdup (s);
+  return strcmp (NONULL (a), NONULL (b));
+}
+
+int str_casecmp (const char *a, const char *b)
+{
+  return strcasecmp (NONULL (a), NONULL (b));
+}
+
+int str_ncmp (const char *a, const char *b, size_t l)
+{
+  return strncmp (NONULL (a), NONULL (b), l);
+}
+
+int str_ncasecmp (const char *a, const char *b, size_t l)
+{
+  return strncasecmp (NONULL (a), NONULL (b), l);
 }
 
-void mutt_str_adjust (char **p)
+size_t str_len (const char *a)
+{
+  return a ? strlen (a) : 0;
+}
+
+int str_coll (const char *a, const char *b)
+{
+  return strcoll (NONULL (a), NONULL (b));
+}
+
+void str_replace (char **p, const char *s)
+{
+  p_delete(p);
+  *p = str_dup (s);
+}
+
+void str_adjust (char **p)
 {
   if (!p || !*p)
     return;
-  safe_realloc (p, mutt_strlen (*p) + 1);
+  p_realloc(p, str_len (*p) + 1);
 }
 
 /* convert all characters in the string to lowercase */
-char *mutt_strlower (char *s)
+char *str_tolower (char *s)
 {
   char *p = s;
 
@@ -95,7 +119,7 @@ char *mutt_strlower (char *s)
 
 /* NULL-pointer aware string comparison functions */
 
-char *mutt_substrcpy (char *dest, const char *beg, const char *end,
+char *str_substrcpy (char *dest, const char *beg, const char *end,
                       size_t destlen)
 {
   size_t len;
@@ -108,53 +132,12 @@ char *mutt_substrcpy (char *dest, const char *beg, const char *end,
   return dest;
 }
 
-char *mutt_substrdup (const char *begin, const char *end)
+char *str_substrdup(const char *begin, const char *end)
 {
-  size_t len;
-  char *p;
-
-  if (end)
-    len = end - begin;
-  else
-    len = mutt_strlen (begin);
-
-  p = safe_malloc (len + 1);
-  memcpy (p, begin, len);
-  p[len] = 0;
-  return p;
+    return p_dupstr(begin, (end ? end - begin : strlen(begin)));
 }
 
-int mutt_strcmp (const char *a, const char *b)
-{
-  return strcmp (NONULL (a), NONULL (b));
-}
-
-int mutt_strcasecmp (const char *a, const char *b)
-{
-  return strcasecmp (NONULL (a), NONULL (b));
-}
-
-int mutt_strncmp (const char *a, const char *b, size_t l)
-{
-  return strncmp (NONULL (a), NONULL (b), l);
-}
-
-int mutt_strncasecmp (const char *a, const char *b, size_t l)
-{
-  return strncasecmp (NONULL (a), NONULL (b), l);
-}
-
-size_t mutt_strlen (const char *a)
-{
-  return a ? strlen (a) : 0;
-}
-
-int mutt_strcoll (const char *a, const char *b)
-{
-  return strcoll (NONULL (a), NONULL (b));
-}
-
-const char *mutt_stristr (const char *haystack, const char *needle)
+const char *str_isstr (const char *haystack, const char *needle)
 {
   const char *p, *q;
 
@@ -175,17 +158,22 @@ const char *mutt_stristr (const char *haystack, const char *needle)
   return NULL;
 }
 
-char *mutt_skip_whitespace (char *p)
-{
-  SKIPWS (p);
-  return p;
+int str_eq (const char* s1, const char* s2) {
+  int l = str_len (s1);
+
+  if (l != str_len (s2))
+    return (0);
+  return (str_ncmp (s1, s2, l) == 0);
 }
 
-void mutt_remove_trailing_ws (char *s)
-{
+char* str_skip_initws (char* s) {
+  SKIPWS (s);
+  return (s);
+}
+
+void str_skip_trailws (char *s) {
   char *p;
 
-  for (p = s + mutt_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
+  for (p = s + str_len (s) - 1; p >= s && ISSPACE (*p); p--)
     *p = 0;
 }
-