X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=5b9c13ad38b8f1caeff614369f9a5780fc8afbfe;hp=d9e8a2ae8cfc7b937bd09f2ae68c9fd4daf25c1e;hb=42cc85de46ed8971a6c793835023cf26766fb096;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/pattern.c b/pattern.c
index d9e8a2a..5b9c13a 100644
--- a/pattern.c
+++ b/pattern.c
@@ -12,9 +12,9 @@
 #endif
 
 #include "mutt.h"
+#include "mx.h"
 #include "mapping.h"
 #include "keymap.h"
-#include "mailbox.h"
 #include "copy.h"
 
 #include "lib/mem.h"
@@ -766,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);
@@ -1132,9 +1132,14 @@ int mutt_pattern_func (int op, char *prompt)
 
   strfcpy (buf, NONULL (Context->pattern), sizeof (buf));
   if (prompt || op != M_LIMIT)
-    if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0
-        || !buf[0])
+    if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0)
       return (-1);
+  if (!buf[0]) {
+    if (op == M_LIMIT)
+      strncpy (buf, "~A", sizeof (buf));
+    else
+      return (-1);
+  }
 
   mutt_message _("Compiling search pattern...");
 
@@ -1218,7 +1223,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);