#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "handler.h"
#include "enter.h"
-#include "ascii.h"
#include "mx.h"
#include "mapping.h"
#include "keymap.h"
#include "copy.h"
#include "mime.h"
-#include "lib/str.h"
#ifdef USE_IMAP
#include "mx.h"
match = 1;
break;
}
- lng -= str_len (buf);
+ lng -= m_strlen(buf);
}
p_delete(&buf);
#endif
if (pat->stringmatch) {
- pat->str = str_dup (buf.data);
+ pat->str = m_strdup(buf.data);
p_delete(&buf.data);
} else {
pat->rx = p_new(regex_t, 1);
memset (&ps, 0, sizeof (ps));
ps.dptr = s;
- ps.dsize = str_len (s);
+ ps.dsize = m_strlen(s);
while (*ps.dptr) {
SKIPWS (ps.dptr);
mutt_message _("Compiling search pattern...");
- simple = str_dup (buf);
+ simple = m_strdup(buf);
mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
err.data = error;