X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=5e521c6fc2cb920f9f37e5f1d3fa12adf3324af9;hp=7144c51b389288ed6ad1c0df08048608d5f68641;hb=a264c7bd834b6a72c90e9f672a2e0fdb06c18083;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/pattern.c b/pattern.c
index 7144c51..5e521c6 100644
--- a/pattern.c
+++ b/pattern.c
@@ -12,11 +12,15 @@
 #endif
 
 #include "mutt.h"
+#include "mx.h"
 #include "mapping.h"
 #include "keymap.h"
-#include "mailbox.h"
 #include "copy.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -200,7 +204,7 @@ msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
         match = 1;
         break;
       }
-      lng -= mutt_strlen (buf);
+      lng -= safe_strlen (buf);
     }
 
     mx_close_message (&msg);
@@ -663,7 +667,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
 
   memset (&ps, 0, sizeof (ps));
   ps.dptr = s;
-  ps.dsize = mutt_strlen (s);
+  ps.dsize = safe_strlen (s);
 
   while (*ps.dptr) {
     SKIPWS (ps.dptr);
@@ -762,7 +766,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
         return NULL;
       }
       /* compile the sub-expression */
-      buf = mutt_substrdup (ps.dptr + 1, p);
+      buf = str_substrdup (ps.dptr + 1, p);
       if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
         FREE (&buf);
         mutt_pattern_free (&curlist);
@@ -1094,7 +1098,7 @@ void mutt_check_simple (char *s, size_t len, const char *simple)
 
   if (!strchr (s, '~')) {       /* yup, so spoof a real request */
     /* convert old tokens into the new format */
-    if (ascii_strcasecmp ("all", s) == 0 || !mutt_strcmp ("^", s) || !mutt_strcmp (".", s))     /* ~A is more efficient */
+    if (ascii_strcasecmp ("all", s) == 0 || !safe_strcmp ("^", s) || !safe_strcmp (".", s))     /* ~A is more efficient */
       strfcpy (s, "~A", len);
     else if (ascii_strcasecmp ("del", s) == 0)
       strfcpy (s, "~D", len);
@@ -1214,7 +1218,7 @@ int mutt_pattern_func (int op, char *prompt)
       }
 #endif
     }
-    else if (mutt_strncmp (buf, "~A", 2) != 0) {
+    else if (safe_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);
@@ -1252,7 +1256,7 @@ int mutt_search_command (int cur, int op)
     strfcpy (temp, buf, sizeof (temp));
     mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
 
-    if (!SearchPattern || mutt_strcmp (temp, LastSearchExpn)) {
+    if (!SearchPattern || safe_strcmp (temp, LastSearchExpn)) {
       set_option (OPTSEARCHINVALID);
       strfcpy (LastSearch, buf, sizeof (LastSearch));
       mutt_message _("Compiling search pattern...");