X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=3ba5e62c6988d9d11d0775576603c62ba80cee8b;hp=3233a9288ef670137bab14fbd7ac97059bac1e21;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=fcaada9d60ee8f52bbc8503c06fe061ca9e2fa68 diff --git a/pattern.c b/pattern.c index 3233a92..3ba5e62 100644 --- a/pattern.c +++ b/pattern.c @@ -10,31 +10,28 @@ #include #include -#include -#include +#include #include +#include -#include "mutt.h" +#include "pattern.h" #include "alias.h" +#include "crypt.h" #include "handler.h" #include "keymap.h" #include "copy.h" -#include - -#include - static int eat_regexp (pattern_t * pat, BUFFER *, BUFFER *); static int eat_date (pattern_t * pat, BUFFER *, BUFFER *); static int eat_range (pattern_t * pat, BUFFER *, BUFFER *); static int patmatch (const pattern_t* pat, const char* buf); -struct pattern_flags { +static struct pattern_flags { int tag; /* character used to represent this op */ int op; /* operation to perform */ int class; int (*eat_arg)(pattern_t *, BUFFER *, BUFFER *); -} Flags[] = { +} const Flags[] = { {'A', M_ALL, 0, NULL}, {'b', M_BODY, M_FULL_MSG, eat_regexp}, {'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp}, @@ -72,9 +69,6 @@ struct pattern_flags { {'u', M_SUBSCRIBED_LIST, 0, NULL}, {'v', M_COLLAPSED, 0, NULL}, {'V', M_CRYPT_VERIFIED, 0, NULL}, -#ifdef USE_NNTP - {'w', M_NEWSGROUPS, 0, eat_regexp}, -#endif {'x', M_REFERENCE, 0, eat_regexp}, {'X', M_MIMEATTACH, 0, eat_range}, {'y', M_XLABEL, 0, eat_regexp}, @@ -102,6 +96,16 @@ static char LastSearchExpn[LONG_STRING] = { 0 }; /* expanded version of #define M_PDR_ERROR 0x0100 #define M_PDR_ERRORDONE (M_PDR_ERROR | M_PDR_DONE) +void pattern_wipe(pattern_t *pat) +{ + if (pat->rx) { + regfree (pat->rx); + p_delete(&pat->rx); + } + p_delete(&pat->str); + pattern_list_wipe(&pat->child); +} + /* if no uppercase letters are given, do a case-insensitive search */ int mutt_which_case (const char *s) { @@ -133,9 +137,9 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) p_clear(&s, 1); s.fpin = msg->fp; s.flags = M_CHARCONV; - mutt_mktemp (tempfile); - if ((s.fpout = safe_fopen (tempfile, "w+")) == NULL) { - mutt_perror (tempfile); + s.fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); + if (!s.fpout) { + mutt_error(_("Could not create temporary file")); return (0); } @@ -144,17 +148,6 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) if (pat->op != M_HEADER) { mutt_parse_mime_message (ctx, h); - - if ((h->security & ENCRYPT) && !crypt_valid_passphrase (h->security)) - { - mx_close_message (&msg); - if (fp) { - fclose (fp); - unlink (tempfile); - } - return (0); - } - fseeko (msg->fp, h->offset, 0); mutt_body_handler (h->content, &s); } @@ -200,7 +193,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) mx_close_message (&msg); if (option (OPTTHOROUGHSRC)) { - fclose (fp); + m_fclose(&fp); unlink (tempfile); } } @@ -226,12 +219,6 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err) return (-1); } -#if 0 - /* If there are no RE metacharacters, use simple search anyway */ - if (!pat->stringmatch && !strpbrk (buf.data, "|[{.*+?^$")) - pat->stringmatch = 1; -#endif - if (pat->stringmatch) { pat->str = m_strdup(buf.data); p_delete(&buf.data); @@ -393,8 +380,8 @@ static const char *get_offset (struct tm *tm, const char *s, int sign) default: return s; } - mutt_normalize_time (tm); - return (ps + 1); + mktime(tm); + return ps + 1; } static void adjust_date_range (struct tm *min, struct tm *max) @@ -611,15 +598,15 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err) /* Since we allow two dates to be specified we'll have to adjust that. */ adjust_date_range (&min, &max); - pat->min = mutt_mktime (&min, 1); - pat->max = mutt_mktime (&max, 1); + pat->min = mktime(&min); + pat->max = mktime(&max); p_delete(&buffer.data); return 0; } -static struct pattern_flags *lookup_tag (char tag) +static const struct pattern_flags *lookup_tag (char tag) { int i; @@ -629,42 +616,19 @@ static struct pattern_flags *lookup_tag (char tag) return NULL; } -static /* const */ char *find_matching_paren ( /* const */ char *s) -{ - int level = 1; - - for (; *s; s++) { - if (*s == '(') - level++; - else if (*s == ')') { - level--; - if (!level) - break; - } - } - return s; -} - -void mutt_pattern_free (pattern_t ** pat) +static const char *find_matching_paren (const char *s) { - pattern_t *tmp; - - while (*pat) { - tmp = *pat; - *pat = (*pat)->next; + int level = 1; - if (tmp->rx) { - regfree (tmp->rx); - p_delete(&tmp->rx); + for (; *s; s++) { + level += (*s == '(') - (*s == ')'); + if (!level) + break; } - p_delete(&tmp->str); - if (tmp->child) - mutt_pattern_free (&tmp->child); - p_delete(&tmp); - } + return s; } -pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) +pattern_t *mutt_pattern_comp(const char *s, int flags, BUFFER *err) { pattern_t *curlist = NULL; pattern_t *tmp; @@ -673,13 +637,13 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) int alladdr = 0; int or = 0; int implicit = 1; /* used to detect logical AND operator */ - struct pattern_flags *entry; + const struct pattern_flags *entry; char *p; char *buf; BUFFER ps; p_clear(&ps, 1); - ps.dptr = s; + ps.dptr = s; ps.dsize = m_strlen(s); while (*ps.dptr) { @@ -702,7 +666,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) } if (curlist->next) { /* A & B | C == (A & B) | C */ - tmp = new_pattern (); + tmp = pattern_new(); tmp->op = M_AND; tmp->child = curlist; @@ -722,7 +686,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) case '~': if (implicit && or) { /* A | B & C == (A | B) & C */ - tmp = new_pattern (); + tmp = pattern_new(); tmp->op = M_OR; tmp->child = curlist; curlist = tmp; @@ -730,7 +694,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) or = 0; } - tmp = new_pattern (); + tmp = pattern_new(); tmp->not = not; tmp->alladdr = alladdr; tmp->stringmatch = (*ps.dptr == '=') ? 1 : 0; @@ -746,13 +710,13 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) ps.dptr++; /* move past the ~ */ if ((entry = lookup_tag (*ps.dptr)) == NULL) { snprintf (err->data, err->dsize, _("%c: invalid command"), *ps.dptr); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } if (entry->class && (flags & entry->class) == 0) { snprintf (err->data, err->dsize, _("%c: not supported in this mode"), *ps.dptr); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } tmp->op = entry->op; @@ -762,11 +726,11 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) if (entry->eat_arg) { if (!*ps.dptr) { snprintf (err->data, err->dsize, _("missing parameter")); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } if (entry->eat_arg (tmp, &ps, err) == -1) { - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } } @@ -777,14 +741,14 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) if (*p != ')') { snprintf (err->data, err->dsize, _("mismatched parenthesis: %s"), ps.dptr); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } /* compile the sub-expression */ buf = p_dupstr(ps.dptr + 1, p - ps.dptr - 1); if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) { p_delete(&buf); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } p_delete(&buf); @@ -801,7 +765,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) break; default: snprintf (err->data, err->dsize, _("error in pattern at: %s"), ps.dptr); - mutt_pattern_free (&curlist); + pattern_list_wipe(&curlist); return NULL; } } @@ -810,7 +774,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err) return NULL; } if (curlist->next) { - tmp = new_pattern (); + tmp = pattern_new(); tmp->op = or ? M_OR : M_AND; tmp->child = curlist; curlist = tmp; @@ -1085,12 +1049,6 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, && valid_realname(h->env-> from->personal) && h->env->from->mailbox) )) ^ pat->not; -#ifdef USE_NNTP - case M_NEWSGROUPS: - return (pat-> - not ^ (h->env->newsgroups - && patmatch (pat, h->env->newsgroups) == 0)); -#endif } mutt_error (_("error: unknown op %d (report this error)."), pat->op); return (-1); @@ -1146,7 +1104,7 @@ void mutt_check_simple (char *s, ssize_t len, const char *simple) } } -int mutt_pattern_func (int op, char *prompt) +int mutt_pattern_func (int op, const char *prompt) { pattern_t *pat; char buf[LONG_STRING] = "", *simple, error[STRING]; @@ -1231,7 +1189,7 @@ int mutt_pattern_func (int op, char *prompt) /* drop previous limit pattern */ p_delete(&Context->pattern); if (Context->limit_pattern) - mutt_pattern_free (&Context->limit_pattern); + pattern_list_wipe(&Context->limit_pattern); if (Context->msgcount && !Context->vcount) { mutt_error _("No messages matched criteria."); } @@ -1244,7 +1202,7 @@ int mutt_pattern_func (int op, char *prompt) } } p_delete(&simple); - mutt_pattern_free (&pat); + pattern_list_wipe(&pat); return 0; } @@ -1280,7 +1238,7 @@ int mutt_search_command (int cur, int op) m_strcpy(LastSearch, sizeof(LastSearch), buf); mutt_message _("Compiling search pattern..."); - mutt_pattern_free (&SearchPattern); + pattern_list_wipe(&SearchPattern); err.data = error; err.dsize = sizeof (error); if ((SearchPattern =