X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=66d8290b49433eb81330505a360a4c36114a9e27;hp=a02e96ea239243aca2a284d1c9c0fdec8d7487ac;hb=f061b8bfafd1eb3d389e4c9801ff4377de8f9225;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/pattern.c b/pattern.c
index a02e96e..66d8290 100644
--- a/pattern.c
+++ b/pattern.c
@@ -17,15 +17,16 @@
 #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 "handler.h"
 #include "enter.h"
 #include "mx.h"
-#include "mapping.h"
 #include "keymap.h"
 #include "copy.h"
-#include "mime.h"
 
 
 #ifdef USE_IMAP
@@ -359,8 +360,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;
 }
 
@@ -468,7 +468,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 '-':
       {
@@ -524,7 +524,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);
@@ -608,11 +608,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');
       }
     }
@@ -718,7 +718,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
   ps.dsize = m_strlen(s);
 
   while (*ps.dptr) {
-    SKIPWS (ps.dptr);
+    ps.dptr = vskipspaces(ps.dptr);
     switch (*ps.dptr) {
     case '^':
       ps.dptr++;
@@ -792,8 +792,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) {
@@ -878,11 +877,11 @@ static int match_adrlist (pattern_t* pat, int match_personal, int alladdr,
                           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) {
+    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 &&
@@ -904,7 +903,7 @@ static int match_reference (pattern_t* pat, LIST * refs)
   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))
@@ -915,7 +914,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))
@@ -926,7 +925,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))