#include <string.h>
#include <ctype.h>
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/macros.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"
{N_("Undel"), OP_UNDELETE},
{N_("Select"), OP_GENERIC_SELECT_ENTRY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
ADDRESS *mutt_lookup_alias (const char *s)
ALIAS *t = Aliases;
for (; t; t = t->next)
- if (!str_casecmp (s, t->name))
+ if (!m_strcasecmp(s, t->name))
return (t->addr);
return (NULL); /* no such alias */
}
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
- if (str_cmp (a->mailbox, u->data) == 0) { /* alias already found */
+ if (m_strcmp(a->mailbox, u->data) == 0) { /* alias already found */
debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
}
if (!i) {
- u = mem_malloc (sizeof (LIST));
- u->data = str_dup (a->mailbox);
+ u = p_new(LIST, 1);
+ u->data = m_strdup(a->mailbox);
u->next = *expn;
*expn = u;
w = rfc822_cpy_adr (t);
}
}
-ADDRESS *mutt_get_address (ENVELOPE * env, char **pfxp)
+ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
{
ADDRESS *adr;
- char *pfx = NULL;
+ const char *pfx = NULL;
if (mutt_addr_is_user (env->from)) {
if (env->to && !mutt_is_mail_list (env->to)) {
}
}
- new = mem_calloc (1, sizeof (ALIAS));
+ 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);
#define min(a,b) ((a<b)?a:b)
if (s[0] != 0) { /* avoid empty string as strstr argument */
- memset (bestname, 0, sizeof (bestname));
+ p_clear(bestname, sizeof(bestname));
while (a) {
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) {
+ if (m_strcmp(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;
}
while (a) {
if (a->name && (strstr (a->name, s) == a->name)) {
if (!a_list) /* init */
- a_cur = a_list = (ALIAS *) mem_malloc (sizeof (ALIAS));
+ a_cur = a_list = p_new(ALIAS, 1);
else {
- a_cur->next = (ALIAS *) mem_malloc (sizeof (ALIAS));
+ a_cur->next = p_new(ALIAS, 1);
a_cur = a_cur->next;
}
memcpy (a_cur, a, sizeof (ALIAS));
while (a_list) {
a_cur = a_list;
a_list = a_list->next;
- mem_free (&a_cur);
+ p_delete(&a_cur);
}
/* remove any aliases marked for deletion */
{
ALIAS *pa = *(ALIAS **) a;
ALIAS *pb = *(ALIAS **) b;
- int r = str_casecmp (pa->name, pb->name);
+ int r = m_strcasecmp(pa->name, pb->name);
return (RSORT (r));
}
r = 1;
else if (pa->personal) {
if (pb->personal)
- r = str_casecmp (pa->personal, pb->personal);
+ r = m_strcasecmp(pa->personal, pb->personal);
else
r = 1;
}
menu->max++;
}
- mem_realloc (&AliasTable, menu->max * sizeof (ALIAS *));
+ p_realloc(&AliasTable, menu->max);
menu->data = AliasTable;
for (i = omax, aliasp = aliases; aliasp; aliasp = aliasp->next, i++) {
}
mutt_menuDestroy (&menu);
- mem_free (&AliasTable);
+ p_delete(&AliasTable);
}