X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=b1dba84476215d9d47a82b456132a2c679da0663;hp=eb371fc2d1e7146b39ecd292c4e08d1faf7132de;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=617e7d83d14e14e6a520a48e75437211b16c8834 diff --git a/pattern.c b/pattern.c index eb371fc..b1dba84 100644 --- a/pattern.c +++ b/pattern.c @@ -12,20 +12,21 @@ #endif #include +#include +#include +#include +#include +#include +#include #include "mutt.h" -#include "buffer.h" #include "handler.h" #include "enter.h" -#include "ascii.h" #include "mx.h" -#include "mapping.h" #include "keymap.h" #include "copy.h" #include "mime.h" -#include "lib/intl.h" -#include "lib/str.h" #ifdef USE_IMAP #include "mx.h" @@ -163,7 +164,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) if ((msg = mx_open_message (ctx, msgno)) != NULL) { if (option (OPTTHOROUGHSRC)) { /* decode the header / body */ - memset (&s, 0, sizeof (s)); + p_clear(&s, 1); s.fpin = msg->fp; s.flags = M_CHARCONV; mutt_mktemp (tempfile); @@ -225,7 +226,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) match = 1; break; } - lng -= str_len (buf); + lng -= m_strlen(buf); } p_delete(&buf); @@ -246,7 +247,7 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err) BUFFER buf; int r; - memset (&buf, 0, sizeof (buf)); + p_clear(&buf, 1); if (mutt_extract_token (&buf, s, M_TOKEN_PATTERN | M_TOKEN_COMMENT) != 0 || !buf.data) { @@ -266,7 +267,7 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err) #endif if (pat->stringmatch) { - pat->str = str_dup (buf.data); + pat->str = m_strdup(buf.data); p_delete(&buf.data); } else { pat->rx = p_new(regex_t, 1); @@ -358,8 +359,7 @@ int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err) if (skip_quote && *tmp == '"') tmp++; - SKIPWS (tmp); - s->dptr = tmp; + s->dptr = vskipspaces(tmp); return 0; } @@ -467,7 +467,7 @@ static const char *parse_date_range (const char *pc, struct tm *min, const char *pt; char ch = *pc++; - SKIPWS (pc); + pc = vskipspaces(pc); switch (ch) { case '-': { @@ -523,7 +523,7 @@ static const char *parse_date_range (const char *pc, struct tm *min, default: flag |= M_PDR_ERRORDONE; } - SKIPWS (pc); + pc = vskipspaces(pc); } if ((flag & M_PDR_ERROR) && !(flag & M_PDR_ABSOLUTE)) { /* getDate has its own error message, don't overwrite it here */ snprintf (err->data, err->dsize, _("Invalid relative date: %s"), pc - 1); @@ -536,21 +536,21 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err) BUFFER buffer; struct tm min, max; - memset (&buffer, 0, sizeof (buffer)); + p_clear(&buffer, 1); if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0 || !buffer.data) { - strfcpy (err->data, _("error in expression"), err->dsize); + m_strcpy(err->data, err->dsize, _("error in expression")); return (-1); } - memset (&min, 0, sizeof (min)); + p_clear(&min, 1); /* the `0' time is Jan 1, 1970 UTC, so in order to prevent a negative time when doing timezone conversion, we use Jan 2, 1970 UTC as the base here */ min.tm_mday = 2; min.tm_year = 70; - memset (&max, 0, sizeof (max)); + p_clear(&max, 1); /* Arbitrary year in the future. Don't set this too high or mutt_mktime() returns something larger than will @@ -607,11 +607,11 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err) return (-1); } haveMin = TRUE; - SKIPWS (pc); + pc = vskipspaces(pc); if (*pc == '-') { - const char *pt = pc + 1; + const char *pt; - SKIPWS (pt); + pt = skipspaces(pc + 1); untilNow = (*pt == '\0'); } } @@ -712,12 +712,12 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) char *buf; BUFFER ps; - memset (&ps, 0, sizeof (ps)); + p_clear(&ps, 1); ps.dptr = s; - ps.dsize = str_len (s); + ps.dsize = m_strlen(s); while (*ps.dptr) { - SKIPWS (ps.dptr); + ps.dptr = vskipspaces(ps.dptr); switch (*ps.dptr) { case '^': ps.dptr++; @@ -791,8 +791,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) } tmp->op = entry->op; - ps.dptr++; /* eat the operator and any optional whitespace */ - SKIPWS (ps.dptr); + ps.dptr = vskipspaces(ps.dptr + 1); if (entry->eat_arg) { if (!*ps.dptr) { @@ -841,7 +840,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) } } if (!curlist) { - strfcpy (err->data, _("empty pattern"), err->dsize); + m_strcpy(err->data, err->dsize, _("empty pattern")); return NULL; } if (curlist->next) { @@ -1170,24 +1169,24 @@ void mutt_check_simple (char *s, size_t len, const char *simple) if (!strchr (s, '~') && !strchr (s, '=')) { /* yup, so spoof a real request */ /* convert old tokens into the new format */ - if (ascii_strcasecmp ("all", s) == 0 || !str_cmp ("^", s) || !str_cmp (".", s)) /* ~A is more efficient */ - strfcpy (s, "~A", len); + if (ascii_strcasecmp ("all", s) == 0 || !m_strcmp("^", s) || !m_strcmp(".", s)) /* ~A is more efficient */ + m_strcpy(s, len, "~A"); else if (ascii_strcasecmp ("del", s) == 0) - strfcpy (s, "~D", len); + m_strcpy(s, len, "~D"); else if (ascii_strcasecmp ("flag", s) == 0) - strfcpy (s, "~F", len); + m_strcpy(s, len, "~F"); else if (ascii_strcasecmp ("new", s) == 0) - strfcpy (s, "~N", len); + m_strcpy(s, len, "~N"); else if (ascii_strcasecmp ("old", s) == 0) - strfcpy (s, "~O", len); + m_strcpy(s, len, "~O"); else if (ascii_strcasecmp ("repl", s) == 0) - strfcpy (s, "~Q", len); + m_strcpy(s, len, "~Q"); else if (ascii_strcasecmp ("read", s) == 0) - strfcpy (s, "~R", len); + m_strcpy(s, len, "~R"); else if (ascii_strcasecmp ("tag", s) == 0) - strfcpy (s, "~T", len); + m_strcpy(s, len, "~T"); else if (ascii_strcasecmp ("unread", s) == 0) - strfcpy (s, "~U", len); + m_strcpy(s, len, "~U"); else { quote_simple (tmp, sizeof (tmp), s); mutt_expand_fmt (s, len, simple, tmp); @@ -1202,14 +1201,14 @@ int mutt_pattern_func (int op, char *prompt) BUFFER err; int i; - strfcpy (buf, NONULL (Context->pattern), sizeof (buf)); + m_strcpy(buf, sizeof(buf), NONULL(Context->pattern)); if (prompt || op != M_LIMIT) if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0]) return (-1); mutt_message _("Compiling search pattern..."); - simple = str_dup (buf); + simple = m_strdup(buf); mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch)); err.data = error; @@ -1288,7 +1287,7 @@ int mutt_pattern_func (int op, char *prompt) } /* record new limit pattern, unless match all */ - if (str_ncmp (buf, "~A", 2) != 0) { + if (m_strncmp(buf, "~A", 2) != 0) { Context->pattern = simple; simple = NULL; /* don't clobber it */ Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err); @@ -1310,7 +1309,7 @@ int mutt_search_command (int cur, int op) HEADER *h; if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) { - strfcpy (buf, LastSearch, sizeof (buf)); + m_strcpy(buf, sizeof(buf), LastSearch); if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") : _("Reverse search for: "), buf, sizeof (buf), M_CLEAR | M_PATTERN) != 0 || !buf[0]) @@ -1323,12 +1322,12 @@ int mutt_search_command (int cur, int op) /* compare the *expanded* version of the search pattern in case $simple_search has changed while we were searching */ - strfcpy (temp, buf, sizeof (temp)); + m_strcpy(temp, sizeof(temp), buf); mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch)); - if (!SearchPattern || str_cmp (temp, LastSearchExpn)) { + if (!SearchPattern || m_strcmp(temp, LastSearchExpn)) { set_option (OPTSEARCHINVALID); - strfcpy (LastSearch, buf, sizeof (LastSearch)); + m_strcpy(LastSearch, sizeof(LastSearch), buf); mutt_message _("Compiling search pattern..."); mutt_pattern_free (&SearchPattern);