#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_idna.h"
-#include "mapping.h"
#include "sort.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
tmp = rfc822_cpy_adr (r->addr);
if (!tmp->next && !tmp->personal)
- tmp->personal = str_dup (r->name);
+ tmp->personal = m_strdup(r->name);
mutt_addrlist_to_idna (tmp, NULL);
return tmp;
l = mutt_strwidth (p);
if (l > FirstColumn)
FirstColumn = l;
- cur->name = str_dup (p);
+ cur->name = m_strdup(p);
p = strtok (NULL, "\t\n");
if (p) {
- cur->other = str_dup (p);
+ cur->other = m_strdup(p);
}
}
}
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
- str_len (table[num].data->name), 0);
+ m_strlen(table[num].data->name), 0);
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
int tagged = 0;
size_t curpos = 0;
- memset (buf, 0, buflen);
+ p_clear(buf, buflen);
/* check for tagged entries */
for (i = 0; i < menu->max; i++) {
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
- curpos = str_len (buf);
+ curpos = m_strlen(buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
- curpos = str_len (buf);
+ curpos = m_strlen(buf);
rfc822_free_address (&tmpa);
}
}