X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=35cdbd91f3e8bf419483f01c37e13dee8d1561e2;hp=84e2cea250419ffda916bd6353dcffe1023211ac;hb=63b91e68a864bbd052b4b421cb77a0fd2a748ea4;hpb=fd958ee8a2c85e3cc5c2f45a426ef4b724191f57

diff --git a/pattern.c b/pattern.c
index 84e2cea..35cdbd9 100644
--- a/pattern.c
+++ b/pattern.c
@@ -11,20 +11,24 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
+
 #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/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <imap/imap.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -33,11 +37,12 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 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 {
   int tag;                      /* character used to represent this op */
@@ -80,6 +85,7 @@ struct pattern_flags {
   'T', M_TAG, 0, NULL}, {
   't', M_TO, 0, eat_regexp}, {
   'U', M_UNREAD, 0, NULL}, {
+  'u', M_SUBSCRIBED_LIST, 0, NULL}, {
   'v', M_COLLAPSED, 0, NULL}, {
   'V', M_CRYPT_VERIFIED, 0, NULL},
 #ifdef USE_NNTP
@@ -88,12 +94,13 @@ struct pattern_flags {
 #endif
   {
   'x', M_REFERENCE, 0, eat_regexp}, {
+  'X', M_MIMEATTACH, 0, eat_range}, {
   'y', M_XLABEL, 0, eat_regexp}, {
   'z', M_SIZE, 0, eat_range}, {
   '=', M_DUPLICATED, 0, NULL}, {
   '$', M_UNREFERENCED, 0, NULL}, {
   '*', M_REALNAME, 0, NULL}, {
-  0}
+  0, 0, 0, NULL}
 };
 
 static pattern_t *SearchPattern = NULL; /* current search pattern */
@@ -138,8 +145,7 @@ int mutt_which_case (const char *s)
 }
 
 static int
-msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
-            int msgno)
+msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
 {
   char tempfile[_POSIX_PATH_MAX];
   MESSAGE *msg = NULL;
@@ -149,11 +155,13 @@ msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
   long lng = 0;
   int match = 0;
   HEADER *h = ctx->hdrs[msgno];
+  char* buf;
+  ssize_t blen;
 
   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);
@@ -162,14 +170,14 @@ msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
         return (0);
       }
 
-      if (op != M_BODY)
+      if (pat->op != M_BODY)
         mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
 
-      if (op != M_HEADER) {
+      if (pat->op != M_HEADER) {
         mutt_parse_mime_message (ctx, h);
 
-        if (WithCrypto && (h->security & ENCRYPT)
-            && !crypt_valid_passphrase (h->security)) {
+        if ((h->security & ENCRYPT) && !crypt_valid_passphrase (h->security))
+        {
           mx_close_message (&msg);
           if (fp) {
             fclose (fp);
@@ -178,41 +186,48 @@ msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
           return (0);
         }
 
-        fseek (msg->fp, h->offset, 0);
+        fseeko (msg->fp, h->offset, 0);
         mutt_body_handler (h->content, &s);
       }
 
       fp = s.fpout;
       fflush (fp);
-      fseek (fp, 0, 0);
+      fseeko (fp, 0, 0);
       fstat (fileno (fp), &st);
       lng = (long) st.st_size;
     }
     else {
       /* raw header / body */
       fp = msg->fp;
-      if (op != M_BODY) {
-        fseek (fp, h->offset, 0);
+      if (pat->op != M_BODY) {
+        fseeko (fp, h->offset, 0);
         lng = h->content->offset - h->offset;
       }
-      if (op != M_HEADER) {
-        if (op == M_BODY)
-          fseek (fp, h->content->offset, 0);
+      if (pat->op != M_HEADER) {
+        if (pat->op == M_BODY)
+          fseeko (fp, h->content->offset, 0);
         lng += h->content->length;
       }
     }
 
+    buf = p_new(char, blen = STRING);
+
     /* search the file "fp" */
     while (lng > 0) {
-      if (fgets (buf, blen - 1, fp) == NULL)
+      if (pat->op == M_HEADER) {
+        if (!mutt_read_rfc822_line(fp, &buf, &blen))
+          break;
+      } else if (fgets (buf, blen - 1, fp) == NULL)
         break;                  /* don't loop forever */
-      if (regexec (rx, buf, 0, NULL, 0) == 0) {
+      if (patmatch (pat, buf) == 0) {
         match = 1;
         break;
       }
-      lng -= str_len (buf);
+      lng -= m_strlen(buf);
     }
 
+    p_delete(&buf);
+
     mx_close_message (&msg);
 
     if (option (OPTTHOROUGHSRC)) {
@@ -229,27 +244,50 @@ 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) {
     snprintf (err->data, err->dsize, _("Error in expression: %s"), s->dptr);
     return (-1);
   }
-  pat->rx = mem_malloc (sizeof (regex_t));
-  r =
-    REGCOMP (pat->rx, buf.data,
-             REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
-  mem_free (&buf.data);
-  if (r) {
-    regerror (r, pat->rx, err->data, err->dsize);
-    regfree (pat->rx);
-    mem_free (&pat->rx);
+
+  if (!*buf.data) {
+    snprintf (err->data, err->dsize, _("Empty expression"));
     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);
+  } else {
+    pat->rx = p_new(regex_t, 1);
+    r = REGCOMP (pat->rx, buf.data, REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
+    p_delete(&buf.data);
+    if (r) {
+      regerror (r, pat->rx, err->data, err->dsize);
+      regfree (pat->rx);
+      p_delete(&pat->rx);
+      return (-1);
+    }
+  }
   return 0;
 }
 
-int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err)
+static int patmatch (const pattern_t* pat, const char* buf) {
+  if (pat->stringmatch)
+    return !strstr (buf, pat->str);
+  else
+    return regexec (pat->rx, buf, 0, NULL, 0);
+}
+
+int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err __attribute__ ((unused)))
 {
   char *tmp;
   int do_exclusive = 0;
@@ -318,8 +356,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;
 }
 
@@ -427,7 +464,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 '-':
       {
@@ -483,7 +520,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);
@@ -496,21 +533,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
@@ -563,15 +600,15 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
     if (isdigit ((unsigned char) *pc)) {
       /* mininum date specified */
       if ((pc = getDate (pc, &min, err)) == NULL) {
-        mem_free (&buffer.data);
+        p_delete(&buffer.data);
         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');
       }
     }
@@ -596,7 +633,7 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
       max.tm_mday = min.tm_mday;
 
       if (!parse_date_range (pc, &min, &max, haveMin, &baseMin, err)) { /* bail out on any parsing error */
-        mem_free (&buffer.data);
+        p_delete(&buffer.data);
         return (-1);
       }
     }
@@ -608,7 +645,7 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
   pat->min = mutt_mktime (&min, 1);
   pat->max = mutt_mktime (&max, 1);
 
-  mem_free (&buffer.data);
+  p_delete(&buffer.data);
 
   return 0;
 }
@@ -649,11 +686,12 @@ void mutt_pattern_free (pattern_t ** pat)
 
     if (tmp->rx) {
       regfree (tmp->rx);
-      mem_free (&tmp->rx);
+      p_delete(&tmp->rx);
     }
+    p_delete(&tmp->str);
     if (tmp->child)
       mutt_pattern_free (&tmp->child);
-    mem_free (&tmp);
+    p_delete(&tmp);
   }
 }
 
@@ -671,12 +709,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++;
@@ -710,6 +748,8 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
       not = 0;
       alladdr = 0;
       break;
+    case '=':
+      /* fallthrough */
     case '~':
       if (implicit && or) {
         /* A | B & C == (A | B) & C */
@@ -724,6 +764,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
       tmp = new_pattern ();
       tmp->not = not;
       tmp->alladdr = alladdr;
+      tmp->stringmatch = (*ps.dptr == '=') ? 1 : 0;
       not = 0;
       alladdr = 0;
 
@@ -747,8 +788,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) {
@@ -772,13 +812,13 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
         return NULL;
       }
       /* compile the sub-expression */
-      buf = str_substrdup (ps.dptr + 1, p);
+      buf = p_dupstr(ps.dptr + 1, p - ps.dptr - 1);
       if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
-        mem_free (&buf);
+        p_delete(&buf);
         mutt_pattern_free (&curlist);
         return NULL;
       }
-      mem_free (&buf);
+      p_delete(&buf);
       if (last)
         last->next = tmp;
       else
@@ -797,7 +837,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) {
@@ -829,37 +869,37 @@ perform_or (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT * ctx,
   return 0;
 }
 
-static int match_adrlist (regex_t * rx, int match_personal, int alladdr,
+static int match_adrlist (pattern_t* pat, int match_personal, int alladdr __attribute__ ((unused)),
                           int n, ...)
 {
   va_list ap;
-  ADDRESS *a;
+  address_t *a;
 
   va_start (ap, n);
   for (; n; n--) {
-    for (a = va_arg (ap, ADDRESS *); a; a = a->next) {
-      if (alladdr ^
-          ((a->mailbox && regexec (rx, a->mailbox, 0, NULL, 0) == 0) ||
+    for (a = va_arg (ap, address_t *); a; a = a->next) {
+      if (pat->alladdr ^
+          ((a->mailbox && patmatch (pat, a->mailbox) == 0) ||
            (match_personal && a->personal &&
-            regexec (rx, a->personal, 0, NULL, 0) == 0))) {
+            patmatch (pat, a->personal) == 0))) {
         va_end (ap);
-        return (!alladdr);      /* Found match, or non-match if alladdr */
+        return (!pat->alladdr);      /* Found match, or non-match if alladdr */
       }
     }
   }
   va_end (ap);
-  return alladdr;               /* No matches, or all matches if alladdr */
+  return pat->alladdr;               /* No matches, or all matches if alladdr */
 }
 
-static int match_reference (regex_t * rx, LIST * refs)
+static int match_reference (pattern_t* pat, LIST * refs)
 {
   for (; refs; refs = refs->next)
-    if (regexec (rx, refs->data, 0, NULL, 0) == 0)
+    if (patmatch (pat, refs->data) == 0)
       return 1;
   return 0;
 }
 
-int mutt_is_list_recipient (int alladdr, ADDRESS * a1, ADDRESS * a2)
+int mutt_is_list_recipient (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_is_subscribed_list (a1))
@@ -870,7 +910,7 @@ int mutt_is_list_recipient (int alladdr, ADDRESS * a1, ADDRESS * a2)
   return alladdr;
 }
 
-int mutt_is_list_cc (int alladdr, ADDRESS * a1, ADDRESS * a2)
+int mutt_is_list_cc (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_is_mail_list (a1))
@@ -881,7 +921,7 @@ int mutt_is_list_cc (int alladdr, ADDRESS * a1, ADDRESS * a2)
   return alladdr;
 }
 
-static int match_user (int alladdr, ADDRESS * a1, ADDRESS * a2)
+static int match_user (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_addr_is_user (a1))
@@ -917,8 +957,6 @@ int
 mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
                    CONTEXT * ctx, HEADER * h)
 {
-  char buf[STRING];
-
   switch (pat->op) {
   case M_AND:
     return (pat->not ^ (perform_and (pat->child, flags, ctx, h) > 0));
@@ -958,30 +996,30 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
   case M_BODY:
   case M_HEADER:
   case M_WHOLE_MSG:
-    return (pat->
-            not ^ msg_search (ctx, pat->rx, buf, sizeof (buf), pat->op,
-                              h->msgno));
+    /* IMAP search sets h->matched at search compile time */
+    if (ctx->magic == M_IMAP && pat->stringmatch)
+      return (h->matched);
+    return (pat->not ^ msg_search (ctx, pat, h->msgno));
   case M_SENDER:
-    return (pat->not ^ match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+    return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                       pat->alladdr, 1, h->env->sender));
   case M_FROM:
-    return (pat->not ^ match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+    return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                       pat->alladdr, 1, h->env->from));
   case M_TO:
-    return (pat->not ^ match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+    return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                       pat->alladdr, 1, h->env->to));
   case M_CC:
-    return (pat->not ^ match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+    return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                       pat->alladdr, 1, h->env->cc));
   case M_SUBJECT:
     return (pat->
             not ^ (h->env && h->env->subject
-                   && regexec (pat->rx, h->env->subject, 0, NULL, 0) == 0));
+                   && patmatch (pat, h->env->subject) == 0));
   case M_ID:
     return (pat->
             not ^ (h->env && h->env->message_id
-                   && regexec (pat->rx, h->env->message_id, 0, NULL,
-                               0) == 0));
+                   && patmatch (pat, h->env->message_id) == 0));
   case M_SCORE:
     return (pat->not ^ (h->score >= pat->min && (pat->max == M_MAXRANGE ||
                                                  h->score <= pat->max)));
@@ -991,21 +1029,26 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
                    && (pat->max == M_MAXRANGE
                        || h->content->length <= pat->max)));
   case M_REFERENCE:
-    return (pat->not ^ match_reference (pat->rx, h->env->references));
+    return (pat->not ^ match_reference (pat, h->env->references));
   case M_ADDRESS:
     return (pat->
             not ^ (h->env
-                   && match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+                   && match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                      pat->alladdr, 4, h->env->from,
                                      h->env->sender, h->env->to,
                                      h->env->cc)));
   case M_RECIPIENT:
     return (pat->
             not ^ (h->env
-                   && match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS,
+                   && match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                      pat->alladdr, 2, h->env->to,
                                      h->env->cc)));
   case M_LIST:
+    return (pat->
+            not ^ (h->env
+                   && mutt_is_list_cc (pat->alladdr, h->env->to,
+                                       h->env->cc)));
+  case M_SUBSCRIBED_LIST:
     return (pat->
             not ^ (h->env
                    && mutt_is_list_recipient (pat->alladdr, h->env->to,
@@ -1020,33 +1063,41 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
   case M_COLLAPSED:
     return (pat->not ^ (h->collapsed && h->num_hidden > 1));
   case M_CRYPT_SIGN:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & SIGN) ? 1 : 0));
   case M_CRYPT_VERIFIED:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & GOODSIGN) ? 1 : 0));
   case M_CRYPT_ENCRYPT:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & ENCRYPT) ? 1 : 0));
   case M_PGP_KEY:
-    if (!(WithCrypto & APPLICATION_PGP))
-      break;
     return (pat->not ^ ((h->security & APPLICATION_PGP)
                         && (h->security & PGPKEY)));
   case M_XLABEL:
     return (pat->
             not ^ (h->env->x_label
-                   && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0));
+                   && patmatch (pat, h->env->x_label) == 0));
   case M_HORMEL:
     return (pat->
             not ^ (h->env->spam && h->env->spam->data
-                   && regexec (pat->rx, h->env->spam->data, 0, NULL,
-                               0) == 0));
+                   && patmatch (pat, h->env->spam->data) == 0));
   case M_DUPLICATED:
     return (pat->not ^ (h->thread && h->thread->duplicate_thread));
+
+  case M_MIMEATTACH:
+    {
+      int count;
+      
+      if (h->content->parts)
+        count = mutt_count_body_parts(h, 0);
+      else {
+        mutt_parse_mime_message(ctx, h);
+        count = mutt_count_body_parts(h, 0);
+        mutt_free_body(&h->content->parts);
+      }
+      
+      return (pat->not ^ (count >= pat->min && (pat->max == M_MAXRANGE ||
+                                                count <= pat->max)));
+    }
+
   case M_UNREFERENCED:
     return (pat->not ^ (h->thread && !h->thread->child));
   case M_MULTIPART:
@@ -1073,17 +1124,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
   case M_NEWSGROUPS:
     return (pat->
             not ^ (h->env->newsgroups
-                   && regexec (pat->rx, h->env->newsgroups, 0, NULL,
-                               0) == 0));
+                   && patmatch (pat, h->env->newsgroups) == 0));
 #endif
   }
   mutt_error (_("error: unknown op %d (report this error)."), pat->op);
   return (-1);
 }
 
-static void quote_simple (char *tmp, size_t len, const char *p)
+static void quote_simple (char *tmp, ssize_t len, const char *p)
 {
-  int i = 0;
+  ssize_t i = 0;
 
   tmp[i++] = '"';
   while (*p && i < len - 3) {
@@ -1104,26 +1154,26 @@ void mutt_check_simple (char *s, size_t len, const char *simple)
    * equivalences?
    */
 
-  if (!strchr (s, '~')) {       /* yup, so spoof a real request */
+  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);
@@ -1138,30 +1188,27 @@ 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)
-      return (-1);
-  if (!buf[0]) {
-    if (op == M_LIMIT)
-      strncpy (buf, "~A", sizeof (buf));
-    else
+    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;
   err.dsize = sizeof (error);
   if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL) {
-    mem_free (&simple);
+    p_delete(&simple);
     mutt_error ("%s", err.data);
     return (-1);
   }
 
+  if (Context->magic == M_IMAP && imap_search (Context, pat) < 0)
+    return -1;
+
   mutt_message _("Executing command on matching messages...");
 
 #define THIS_BODY Context->hdrs[i]->content
@@ -1216,28 +1263,22 @@ int mutt_pattern_func (int op, char *prompt)
   mutt_clear_error ();
 
   if (op == M_LIMIT) {
-    mem_free (&Context->pattern);
+    /* drop previous limit pattern */
+    p_delete(&Context->pattern);
     if (Context->limit_pattern)
       mutt_pattern_free (&Context->limit_pattern);
-    if (!Context->vcount) {
+    if (Context->msgcount && !Context->vcount) {
       mutt_error _("No messages matched criteria.");
-
-#if 0
-      Context->vcount = Context->msgcount;
-      /* restore full display */
-      for (i = 0; i < Context->msgcount; i++) {
-        Context->hdrs[i]->virtual = i;
-        Context->v2r[i] = i;
-      }
-#endif
     }
-    else if (str_ncmp (buf, "~A", 2) != 0) {
+
+    /* record new limit pattern, unless match all */
+    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);
     }
   }
-  mem_free (&simple);
+  p_delete(&simple);
   mutt_pattern_free (&pat);
   return 0;
 }
@@ -1253,7 +1294,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])
@@ -1266,12 +1307,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);
@@ -1294,6 +1335,8 @@ int mutt_search_command (int cur, int op)
   if (option (OPTSEARCHINVALID)) {
     for (i = 0; i < Context->msgcount; i++)
       Context->hdrs[i]->searched = 0;
+    if (Context->magic == M_IMAP && imap_search (Context, SearchPattern) < 0)
+      return -1;
     unset_option (OPTSEARCHINVALID);
   }