X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=94c1f9c03cd96a019f9310bd7d6932645eae675f;hp=ea72544f65a08ea375d726133511560be1e82603;hb=7db27b8f24670fd40cf24755f2782a104ad24594;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92

diff --git a/pattern.c b/pattern.c
index ea72544..94c1f9c 100644
--- a/pattern.c
+++ b/pattern.c
@@ -10,14 +10,13 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
-#include <lib-ui/enter.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 #include <imap/imap.h>
 
 #include "pattern.h"
 #include "alias.h"
+#include "crypt.h"
 #include "handler.h"
 #include "keymap.h"
 #include "copy.h"
@@ -70,9 +69,6 @@ static 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},
@@ -141,10 +137,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
       p_clear(&s, 1);
       s.fpin = msg->fp;
       s.flags = M_CHARCONV;
-      s.fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+      s.fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
       if (!s.fpout) {
         mutt_error(_("Could not create temporary file"));
-        return (0);
+        return 0;
       }
 
       if (pat->op != M_BODY)
@@ -152,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) {
-            m_fclose(&fp);
-            unlink (tempfile);
-          }
-          return (0);
-        }
-
         fseeko (msg->fp, h->offset, 0);
         mutt_body_handler (h->content, &s);
       }
@@ -226,12 +211,12 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err)
   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);
+    return -1;
   }
 
   if (!*buf.data) {
     snprintf (err->data, err->dsize, _("Empty expression"));
-    return (-1);
+    return -1;
   }
 
   if (pat->stringmatch) {
@@ -245,7 +230,7 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err)
       regerror (r, pat->rx, err->data, err->dsize);
       regfree (pat->rx);
       p_delete(&pat->rx);
-      return (-1);
+      return -1;
     }
   }
   return 0;
@@ -395,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)
@@ -496,7 +481,7 @@ static const char *parse_date_range (const char *pc, struct tm *min,
   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);
   }
-  return ((flag & M_PDR_ERROR) ? NULL : pc);
+  return (flag & M_PDR_ERROR) ? NULL : pc;
 }
 
 static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
@@ -508,7 +493,7 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
   if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0
       || !buffer.data) {
     m_strcpy(err->data, err->dsize, _("error in expression"));
-    return (-1);
+    return -1;
   }
 
   p_clear(&min, 1);
@@ -572,7 +557,7 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
       /* mininum date specified */
       if ((pc = getDate (pc, &min, err)) == NULL) {
         p_delete(&buffer.data);
-        return (-1);
+        return -1;
       }
       haveMin = TRUE;
       pc = vskipspaces(pc);
@@ -605,7 +590,7 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
 
       if (!parse_date_range (pc, &min, &max, haveMin, &baseMin, err)) { /* bail out on any parsing error */
         p_delete(&buffer.data);
-        return (-1);
+        return -1;
       }
     }
   }
@@ -613,8 +598,8 @@ 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);
 
@@ -627,24 +612,20 @@ static const struct pattern_flags *lookup_tag (char tag)
 
   for (i = 0; Flags[i].tag; i++)
     if (Flags[i].tag == tag)
-      return (&Flags[i]);
+      return &Flags[i];
   return NULL;
 }
 
-static /* const */ char *find_matching_paren ( /* const */ char *s)
+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;
+    int level = 1;
+
+    for (; *s; s++) {
+        level += (*s == '(') - (*s == ')');
+        if (!level)
+            break;
     }
-  }
-  return s;
+    return s;
 }
 
 pattern_t *mutt_pattern_comp(const char *s, int flags, BUFFER *err)
@@ -798,7 +779,7 @@ pattern_t *mutt_pattern_comp(const char *s, int flags, BUFFER *err)
     tmp->child = curlist;
     curlist = tmp;
   }
-  return (curlist);
+  return curlist;
 }
 
 static int
@@ -835,7 +816,7 @@ static int match_adrlist (pattern_t* pat, int match_personal, int alladdr __attr
            (match_personal && a->personal &&
             patmatch (pat, a->personal) == 0))) {
         va_end (ap);
-        return (!pat->alladdr);      /* Found match, or non-match if alladdr */
+        return !pat->alladdr;      /* Found match, or non-match if alladdr */
       }
     }
   }
@@ -855,10 +836,10 @@ 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))
-      return (!alladdr);
+      return !alladdr;
   for (; a2; a2 = a2->next)
     if (alladdr ^ mutt_is_subscribed_list (a2))
-      return (!alladdr);
+      return !alladdr;
   return alladdr;
 }
 
@@ -866,10 +847,10 @@ 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))
-      return (!alladdr);
+      return !alladdr;
   for (; a2; a2 = a2->next)
     if (alladdr ^ mutt_is_mail_list (a2))
-      return (!alladdr);
+      return !alladdr;
   return alladdr;
 }
 
@@ -877,10 +858,10 @@ static int match_user (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_addr_is_user (a1))
-      return (!alladdr);
+      return !alladdr;
   for (; a2; a2 = a2->next)
     if (alladdr ^ mutt_addr_is_user (a2))
-      return (!alladdr);
+      return !alladdr;
   return alladdr;
 }
 
@@ -900,7 +881,7 @@ static int valid_realname (const char *name)
       ret--;
     p++;
   }
-  return (ret >= 1);
+  return ret >= 1;
 }
 
 /* flags
@@ -911,31 +892,31 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
 {
   switch (pat->op) {
   case M_AND:
-    return (pat->not ^ (perform_and (pat->child, flags, ctx, h) > 0));
+    return pat->not ^ (perform_and (pat->child, flags, ctx, h) > 0);
   case M_OR:
-    return (pat->not ^ (perform_or (pat->child, flags, ctx, h) > 0));
+    return pat->not ^ (perform_or (pat->child, flags, ctx, h) > 0);
   case M_ALL:
-    return (!pat->not);
+    return !pat->not;
   case M_EXPIRED:
-    return (pat->not ^ h->expired);
+    return pat->not ^ h->expired;
   case M_SUPERSEDED:
-    return (pat->not ^ h->superseded);
+    return pat->not ^ h->superseded;
   case M_FLAG:
-    return (pat->not ^ h->flagged);
+    return pat->not ^ h->flagged;
   case M_TAG:
-    return (pat->not ^ h->tagged);
+    return pat->not ^ h->tagged;
   case M_NEW:
-    return (pat->not ? h->old || h->read : !(h->old || h->read));
+    return pat->not ? h->old || h->read : !(h->old || h->read);
   case M_UNREAD:
-    return (pat->not ? h->read : !h->read);
+    return pat->not ? h->read : !h->read;
   case M_REPLIED:
-    return (pat->not ^ h->replied);
+    return pat->not ^ h->replied;
   case M_OLD:
-    return (pat->not ? (!h->old || h->read) : (h->old && !h->read));
+    return pat->not ? (!h->old || h->read) : (h->old && !h->read);
   case M_READ:
-    return (pat->not ^ h->read);
+    return pat->not ^ h->read;
   case M_DELETED:
-    return (pat->not ^ h->deleted);
+    return pat->not ^ h->deleted;
   case M_MESSAGE:
     return (pat->not ^ (h->msgno >= pat->min - 1 && (pat->max == M_MAXRANGE ||
                                                      h->msgno <=
@@ -944,14 +925,14 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
     return (pat->
             not ^ (h->date_sent >= pat->min && h->date_sent <= pat->max));
   case M_DATE_RECEIVED:
-    return (pat->not ^ (h->received >= pat->min && h->received <= pat->max));
+    return pat->not ^ (h->received >= pat->min && h->received <= pat->max);
   case M_BODY:
   case M_HEADER:
   case M_WHOLE_MSG:
     /* 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));
+      return h->matched;
+    return pat->not ^ msg_search (ctx, pat, h->msgno);
   case M_SENDER:
     return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
                                       pat->alladdr, 1, h->env->sender));
@@ -981,7 +962,7 @@ 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, h->env->references));
+    return pat->not ^ match_reference (pat, h->env->references);
   case M_ADDRESS:
     return (pat->
             not ^ (h->env
@@ -1013,13 +994,13 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
     return (pat->
             not ^ (h->env && match_user (pat->alladdr, h->env->from, NULL)));
   case M_COLLAPSED:
-    return (pat->not ^ (h->collapsed && h->num_hidden > 1));
+    return pat->not ^ (h->collapsed && h->num_hidden > 1);
   case M_CRYPT_SIGN:
-    return (pat->not ^ ((h->security & SIGN) ? 1 : 0));
+    return pat->not ^ ((h->security & SIGN) ? 1 : 0);
   case M_CRYPT_VERIFIED:
-    return (pat->not ^ ((h->security & GOODSIGN) ? 1 : 0));
+    return pat->not ^ ((h->security & GOODSIGN) ? 1 : 0);
   case M_CRYPT_ENCRYPT:
-    return (pat->not ^ ((h->security & ENCRYPT) ? 1 : 0));
+    return pat->not ^ ((h->security & ENCRYPT) ? 1 : 0);
   case M_PGP_KEY:
     return (pat->not ^ ((h->security & APPLICATION_PGP)
                         && (h->security & PGPKEY)));
@@ -1032,7 +1013,7 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
             not ^ (h->env->spam && h->env->spam->data
                    && patmatch (pat, h->env->spam->data) == 0));
   case M_DUPLICATED:
-    return (pat->not ^ (h->thread && h->thread->duplicate_thread));
+    return pat->not ^ (h->thread && h->thread->duplicate_thread);
 
   case M_MIMEATTACH:
     {
@@ -1051,9 +1032,9 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
     }
 
   case M_UNREFERENCED:
-    return (pat->not ^ (h->thread && !h->thread->child));
+    return pat->not ^ (h->thread && !h->thread->child);
   case M_MULTIPART:
-    return (pat->not ^ (h->content && h->content->type == TYPEMULTIPART));
+    return pat->not ^ (h->content && h->content->type == TYPEMULTIPART);
   case M_REALNAME:
     /* realname filter:
      * we have a match if
@@ -1068,15 +1049,9 @@ 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);
+  return -1;
 }
 
 static void quote_simple (char *tmp, ssize_t len, const char *p)
@@ -1129,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];
@@ -1139,7 +1114,7 @@ int mutt_pattern_func (int op, char *prompt)
   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);
+      return -1;
 
   mutt_message _("Compiling search pattern...");
 
@@ -1151,7 +1126,7 @@ int mutt_pattern_func (int op, char *prompt)
   if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL) {
     p_delete(&simple);
     mutt_error ("%s", err.data);
-    return (-1);
+    return -1;
   }
 
   if (Context->magic == M_IMAP && imap_search (Context, pat) < 0)
@@ -1246,7 +1221,7 @@ int mutt_search_command (int cur, int op)
     if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
                         _("Reverse search for: "), buf, sizeof (buf),
                         M_CLEAR | M_PATTERN) != 0 || !buf[0])
-      return (-1);
+      return -1;
 
     if (op == OP_SEARCH)
       unset_option (OPTSEARCHREVERSE);
@@ -1269,7 +1244,7 @@ int mutt_search_command (int cur, int op)
       if ((SearchPattern =
            mutt_pattern_comp (temp, M_FULL_MSG, &err)) == NULL) {
         mutt_error ("%s", error);
-        return (-1);
+        return -1;
       }
       mutt_clear_error ();
     }
@@ -1277,7 +1252,7 @@ int mutt_search_command (int cur, int op)
   else if (!SearchPattern) {
     mutt_error _("No search pattern.");
 
-    return (-1);
+    return -1;
   }
 
   if (option (OPTSEARCHINVALID)) {
@@ -1301,7 +1276,7 @@ int mutt_search_command (int cur, int op)
       else {
         mutt_message _("Search hit bottom without finding match");
 
-        return (-1);
+        return -1;
       }
     }
     else if (i < 0) {
@@ -1312,7 +1287,7 @@ int mutt_search_command (int cur, int op)
       else {
         mutt_message _("Search hit top without finding match");
 
-        return (-1);
+        return -1;
       }
     }
 
@@ -1335,7 +1310,7 @@ int mutt_search_command (int cur, int op)
       mutt_error _("Search interrupted.");
 
       SigInt = 0;
-      return (-1);
+      return -1;
     }
 
     i += incr;
@@ -1343,5 +1318,5 @@ int mutt_search_command (int cur, int op)
 
   mutt_error _("Not found.");
 
-  return (-1);
+  return -1;
 }