#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>
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);
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...");
}
#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);