X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fstr.h;h=4786d2766852c05ab2e4478d4b9e8ecc914efb67;hp=bb2d822d63feec2a33c0d3301556373024ffc942;hb=d23094706c228c63c7c7ab8f337fb5dd886c4109;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;ds=sidebyside diff --git a/lib-lib/str.h b/lib-lib/str.h index bb2d822..4786d27 100644 --- a/lib-lib/str.h +++ b/lib-lib/str.h @@ -86,11 +86,11 @@ 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); } @@ -130,6 +130,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++;