X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fstr.h;h=51eeba4aae46f628e1f6634e30c46e9e77646af7;hp=01e6c6231fa85e2dab0707aa91d79da0210421ce;hb=9f1dbdb74d7ca296eaa5fcf45243f7e376d35eab;hpb=81884ccb464c69a8dba9de1b97af261a8a02b2c7 diff --git a/lib-lib/str.h b/lib-lib/str.h index 01e6c62..51eeba4 100644 --- a/lib-lib/str.h +++ b/lib-lib/str.h @@ -16,41 +16,86 @@ * * Copyright © 2006 Pierre Habouzit */ +/* + * Copyright notice from original mutt: + * Copyright (C) 2001 Thomas Roessler + */ #ifndef MUTT_LIB_LIB_STR_H #define MUTT_LIB_LIB_STR_H -#include -#include +/** \file str.h. + * \brief Madmutt string API. + * + * \author Pierre Habouzit + * + * This header contains the prefered string API to be used in Madmutt. + * + * Those function reimplement many usual calls (strlen, strcpy, strcat, …) + * It's intended to provide a uniform and consistent API to deal with usual C + * strings. + * + * The strong point that have to be followed are: + * - strings are always \c '\\0' terminated, meaning that we don't have + * stupid semantics à la strncpy. + * - function try to always work on buffers with its size (including the + * ending \c '\\0') to prevent buffer overflows. + * - string and buffers sizes are ssize_t, negative values are allowed and + * supported. + * - functions use a à la sprintf semantics (for those that produce strings) + * meaning that they all return the len that could have fit in the buffer + * if it would have been big enough. We never try to reallocate the + * buffers, it's up to the caller if it's needed. + */ -#include "../lib/str.h" -#include "mem.h" +#define HUGE_STRING 5120 /**< \brief Huge buffers */ +#define LONG_STRING 1024 /**< \brief Long buffers */ +#define STRING 256 /**< \brief Usual buffers */ -#define HUGE_STRING 5120 -#define LONG_STRING 1024 -#define STRING 256 -#define SHORT_STRING 128 +#define NONULL(x) (x ? x : "") /**< \brief replace \c NULL strings + with emtpy strings */ +#define ISSPACE(c) isspace((unsigned char)c) /**< \brief safe isspace */ -#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 */ +/* conversions */ /****************************************************************************/ static inline int hexval(int c) { - int v = __m_strdigits[c]; - return !(c & ~127) && v < 16 ? v : -1; + return !(c & ~127) && __m_strdigits[c] < 16 ? __m_strdigits[c] : -1; } 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 */ /****************************************************************************/ @@ -80,14 +125,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) { - return strncmp (NONULL(a), NONULL(b), 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 */ /****************************************************************************/ @@ -97,6 +145,23 @@ 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)); +} + +static inline ssize_t m_strputc(char *dst, ssize_t n, int c) { + if (n > 1) { + dst[0] = c; + dst[1] = '\0'; + } + return 1; +} + 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); @@ -115,6 +180,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++; @@ -124,4 +201,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 */