#include <ctype.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_menu.h"
if (!i) {
u = p_new(LIST, 1);
- u->data = str_dup (a->mailbox);
+ u->data = m_strdup(a->mailbox);
u->next = *expn;
*expn = u;
w = rfc822_cpy_adr (t);
new = p_new(ALIAS, 1);
new->self = new;
- new->name = str_dup (buf);
+ new->name = m_strdup(buf);
mutt_addrlist_to_local (adr);
mutt_free_alias (&new);
return;
}
- new->addr->personal = str_dup (buf);
+ new->addr->personal = m_strdup(buf);
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), new->addr, 1);
if (a->name && strstr (a->name, s) == a->name) {
if (!bestname[0]) /* init */
strfcpy (bestname, a->name,
- min (str_len (a->name) + 1, sizeof (bestname)));
+ min (m_strlen(a->name) + 1, sizeof (bestname)));
else {
for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
bestname[i] = 0;
if (bestname[0] != 0) {
if (str_cmp (bestname, s) != 0) {
/* we are adding something to the completion */
- strfcpy (s, bestname, str_len (bestname) + 1);
+ strfcpy (s, bestname, m_strlen(bestname) + 1);
return 1;
}