#endif
#include "mutt.h"
-#include "mutt_regex.h"
#include "mailbox.h"
#include "mime.h"
#include "rfc2047.h"
#include "mutt_crypt.h"
#include "url.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
return (line);
}
- buf += strlen (buf) - 1;
+ buf += mutt_strlen (buf) - 1;
if (*buf == '\n') {
/* we did get a full line. remove trailing space */
while (ISSPACE (*buf))
new = NULL;
if (*s == '<') {
- n = strlen (s);
+ n = mutt_strlen (s);
if (s[n - 1] != '>') {
o = s;
s = NULL;
new = safe_strdup (s);
}
else if (o) {
- m = strlen (s);
+ m = mutt_strlen (s);
if (s[m - 1] == '>') {
new = safe_malloc (sizeof (char) * (n + m + 1));
strcpy (new, o); /* __STRCPY_CHECKED__ */
/* Keep track of the user-defined headers */
if (!matched && user_hdrs) {
/* restore the original line */
- line[strlen (line)] = ':';
+ line[mutt_strlen (line)] = ':';
if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
&& !mutt_matches_ignore (line, UnIgnore))
*buf = '\0';
if (mutt_match_spam_list (line, SpamList, buf, sizeof (buf))) {
- if (!mutt_match_rx_list (line, NoSpamList)) {
+ if (!rx_list_match (NoSpamList, line)) {
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {