projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
lib
/
str.c
diff --git
a/lib/str.c
b/lib/str.c
index
8efa126
..
0db2b6e
100644
(file)
--- a/
lib/str.c
+++ b/
lib/str.c
@@
-23,7
+23,7
@@
char *safe_strdup (const char *s)
if (!s || !*s)
return 0;
if (!s || !*s)
return 0;
- l =
safe
_strlen (s) + 1;
+ l =
mutt
_strlen (s) + 1;
p = (char *) safe_malloc (l);
memcpy (p, s, l);
return (p);
p = (char *) safe_malloc (l);
memcpy (p, s, l);
return (p);
@@
-67,7
+67,7
@@
char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
return p;
}
return p;
}
-int
safe
_strcmp (const char *a, const char *b)
+int
mutt
_strcmp (const char *a, const char *b)
{
return strcmp (NONULL (a), NONULL (b));
}
{
return strcmp (NONULL (a), NONULL (b));
}
@@
-87,7
+87,7
@@
int safe_strncasecmp (const char *a, const char *b, size_t l)
return strncasecmp (NONULL (a), NONULL (b), l);
}
return strncasecmp (NONULL (a), NONULL (b), l);
}
-size_t
safe
_strlen (const char *a)
+size_t
mutt
_strlen (const char *a)
{
return a ? strlen (a) : 0;
}
{
return a ? strlen (a) : 0;
}
@@
-107,7
+107,7
@@
void str_adjust (char **p)
{
if (!p || !*p)
return;
{
if (!p || !*p)
return;
- safe_realloc (p,
safe
_strlen (*p) + 1);
+ safe_realloc (p,
mutt
_strlen (*p) + 1);
}
/* convert all characters in the string to lowercase */
}
/* convert all characters in the string to lowercase */
@@
-146,7
+146,7
@@
char *str_substrdup (const char *begin, const char *end)
if (end)
len = end - begin;
else
if (end)
len = end - begin;
else
- len =
safe
_strlen (begin);
+ len =
mutt
_strlen (begin);
p = safe_malloc (len + 1);
memcpy (p, begin, len);
p = safe_malloc (len + 1);
memcpy (p, begin, len);
@@
-175,16
+175,22
@@
const char *str_isstr (const char *haystack, const char *needle)
return NULL;
}
return NULL;
}
-char *mutt_skip_whitespace (char *p)
-{
- SKIPWS (p);
- return p;
+int str_eq (const char* s1, const char* s2) {
+ int l = mutt_strlen (s1);
+
+ if (l != mutt_strlen (s2))
+ return (0);
+ return (safe_strncmp (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;
char *p;
- for (p = s +
safe
_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
+ for (p = s +
mutt
_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
*p = 0;
}
*p = 0;
}