X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=cd3ba3b680c570f05c4501f78ed6210f65320a47;hp=cef1722b9092de735ff907321b3a5bda7bc72ac1;hb=00f34116b32751764d42f81159c292d850c74bac;hpb=711f787502b6a1a1c150b948a5ed9156c8ef9ba1

diff --git a/pattern.c b/pattern.c
index cef1722..cd3ba3b 100644
--- a/pattern.c
+++ b/pattern.c
@@ -7,51 +7,32 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdarg.h>
-
-#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-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
+#include <imap/imap.h>
 
-#include "mutt.h"
+#include "pattern.h"
 #include "alias.h"
+#include "crypt.h"
 #include "handler.h"
-#include "mx.h"
 #include "keymap.h"
 #include "copy.h"
 
-#include <imap/imap.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 {
+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},
@@ -89,9 +70,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},
@@ -119,17 +97,14 @@ static char LastSearchExpn[LONG_STRING] = { 0 };        /* expanded version of
 #define M_PDR_ERROR	0x0100
 #define M_PDR_ERRORDONE	(M_PDR_ERROR | M_PDR_DONE)
 
-
-int mutt_getvaluebychar (char ch, struct mapping_t *table)
+void pattern_wipe(pattern_t *pat)
 {
-  int i;
-
-  for (i = 0; table[i].name; i++) {
-    if (ch == table[i].name[0])
-      return table[i].value;
-  }
-
-  return (-1);
+    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 */
@@ -163,9 +138,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);
       }
 
@@ -174,17 +149,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);
       }
@@ -230,7 +194,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
     mx_close_message (&msg);
 
     if (option (OPTTHOROUGHSRC)) {
-      fclose (fp);
+      m_fclose(&fp);
       unlink (tempfile);
     }
   }
@@ -256,12 +220,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);
@@ -423,8 +381,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)
@@ -641,15 +599,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;
 
@@ -659,42 +617,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;
@@ -703,13 +638,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) {
@@ -732,7 +667,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;
 
@@ -752,7 +687,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;
@@ -760,7 +695,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;
@@ -776,13 +711,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;
@@ -792,11 +727,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;
         }
       }
@@ -807,14 +742,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);
@@ -831,7 +766,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;
     }
   }
@@ -840,7 +775,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;
@@ -1090,7 +1025,7 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
       else {
         mutt_parse_mime_message(ctx, h);
         count = mutt_count_body_parts(h, 0);
-        mutt_free_body(&h->content->parts);
+        body_list_wipe(&h->content->parts);
       }
       
       return (pat->not ^ (count >= pat->min && (pat->max == M_MAXRANGE ||
@@ -1115,12 +1050,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);
@@ -1171,12 +1100,12 @@ void mutt_check_simple (char *s, ssize_t len, const char *simple)
       m_strcpy(s, len, "~U");
     else {
       quote_simple (tmp, sizeof (tmp), s);
-      mutt_expand_fmt (s, len, simple, tmp);
+      m_file_fmt(s, len, simple, tmp);
     }
   }
 }
 
-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];
@@ -1261,7 +1190,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.");
     }
@@ -1274,7 +1203,7 @@ int mutt_pattern_func (int op, char *prompt)
     }
   }
   p_delete(&simple);
-  mutt_pattern_free (&pat);
+  pattern_list_wipe(&pat);
   return 0;
 }
 
@@ -1310,7 +1239,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 =