X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=9b325a239c726aed4de5ecb92c555a3e21294371;hp=335337e66b9fead1ff2828581e68e84baf5d7bf6;hb=cdb80705105e4a788baeaef0511363a88bda1db5;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/pattern.c b/pattern.c
index 335337e..9b325a2 100644
--- a/pattern.c
+++ b/pattern.c
@@ -28,11 +28,7 @@
 #include "keymap.h"
 #include "copy.h"
 
-
-#ifdef USE_IMAP
-#include "mx.h"
-#include "imap/imap.h"
-#endif
+#include <imap/imap.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -41,7 +37,7 @@
 #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 *);
@@ -219,7 +215,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
     /* search the file "fp" */
     while (lng > 0) {
       if (pat->op == M_HEADER) {
-        if (*(buf = mutt_read_rfc822_line (fp, buf, &blen)) == '\0')
+        if (!mutt_read_rfc822_line(fp, &buf, &blen))
           break;
       } else if (fgets (buf, blen - 1, fp) == NULL)
         break;                  /* don't loop forever */
@@ -1000,11 +996,9 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
   case M_BODY:
   case M_HEADER:
   case M_WHOLE_MSG:
-#ifdef USE_IMAP
     /* IMAP search sets h->matched at search compile time */
     if (ctx->magic == M_IMAP && pat->stringmatch)
       return (h->matched);
-#endif
     return (pat->not ^ msg_search (ctx, pat, h->msgno));
   case M_SENDER:
     return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
@@ -1212,10 +1206,8 @@ int mutt_pattern_func (int op, char *prompt)
     return (-1);
   }
 
-#ifdef USE_IMAP
   if (Context->magic == M_IMAP && imap_search (Context, pat) < 0)
     return -1;
-#endif
 
   mutt_message _("Executing command on matching messages...");
 
@@ -1343,10 +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;
-#ifdef USE_IMAP
     if (Context->magic == M_IMAP && imap_search (Context, SearchPattern) < 0)
       return -1;
-#endif
     unset_option (OPTSEARCHINVALID);
   }