Rocco Rutte:

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index 5b9c13a..8b92597 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -204,7 +204,7 @@ msg_search (CONTEXT * ctx, regex_t * rx, char *buf, size_t blen, int op,
         match = 1;
         break;
       }
         match = 1;
         break;
       }

-      lng -= mutt_strlen (buf);
+      lng -= str_len (buf);

     }
 
     mx_close_message (&msg);
     }
 
     mx_close_message (&msg);


@@ -667,7 +667,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
 
   memset (&ps, 0, sizeof (ps));
   ps.dptr = s;
 
   memset (&ps, 0, sizeof (ps));
   ps.dptr = s;

-  ps.dsize = mutt_strlen (s);
+  ps.dsize = str_len (s);

 
   while (*ps.dptr) {
     SKIPWS (ps.dptr);
 
   while (*ps.dptr) {
     SKIPWS (ps.dptr);


@@ -1098,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 (!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 || !str_cmp ("^", s) || !str_cmp (".", s))     /* ~A is more efficient */

       strfcpy (s, "~A", len);
     else if (ascii_strcasecmp ("del", s) == 0)
       strfcpy (s, "~D", len);
       strfcpy (s, "~A", len);
     else if (ascii_strcasecmp ("del", s) == 0)
       strfcpy (s, "~D", len);


@@ -1143,7 +1143,7 @@ int mutt_pattern_func (int op, char *prompt)
 
   mutt_message _("Compiling search pattern...");
 
 
   mutt_message _("Compiling search pattern...");
 

-  simple = safe_strdup (buf);
+  simple = str_dup (buf);

   mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
 
   err.data = error;
   mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
 
   err.data = error;


@@ -1223,7 +1223,7 @@ int mutt_pattern_func (int op, char *prompt)
       }
 #endif
     }
       }
 #endif
     }

-    else if (safe_strncmp (buf, "~A", 2) != 0) {
+    else if (str_ncmp (buf, "~A", 2) != 0) {

       Context->pattern = simple;
       simple = NULL;            /* don't clobber it */
       Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
       Context->pattern = simple;
       simple = NULL;            /* don't clobber it */
       Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);


@@ -1261,7 +1261,7 @@ int mutt_search_command (int cur, int op)
     strfcpy (temp, buf, sizeof (temp));
     mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
 
     strfcpy (temp, buf, sizeof (temp));
     mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
 

-    if (!SearchPattern || mutt_strcmp (temp, LastSearchExpn)) {
+    if (!SearchPattern || str_cmp (temp, LastSearchExpn)) {

       set_option (OPTSEARCHINVALID);
       strfcpy (LastSearch, buf, sizeof (LastSearch));
       mutt_message _("Compiling search pattern...");
       set_option (OPTSEARCHINVALID);
       strfcpy (LastSearch, buf, sizeof (LastSearch));
       mutt_message _("Compiling search pattern...");