X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=b43689bb84382b7a01175e77659031a86aa3531f;hp=667dad25395d245bbd7157036d417b4773efa12a;hb=238b70e39b78f585c586bd51aef41988b3cc73d1;hpb=ea912b20ba2b3b9dfdbbae758ad56263c9aa41b3 diff --git a/alias.c b/alias.c index 667dad2..b43689b 100644 --- a/alias.c +++ b/alias.c @@ -14,15 +14,17 @@ #include #include -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" +#include +#include +#include +#include +#include + #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" @@ -45,7 +47,7 @@ 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 */ } @@ -65,7 +67,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn) 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; @@ -73,8 +75,8 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn) } 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); @@ -221,7 +223,7 @@ void mutt_create_alias (ENVELOPE * cur, ADDRESS * iadr) } if (adr && adr->mailbox) { - strfcpy (buf, adr->mailbox, sizeof (buf)); + m_strcpy(buf, sizeof(buf), adr->mailbox); if ((pc = strchr (buf, '@'))) *pc = 0; } @@ -247,21 +249,21 @@ retry_name: switch (mutt_yesorno (_("Warning: This alias name may not work. Fix it?"), M_YES)) { case M_YES: - strfcpy (buf, fixed, sizeof (buf)); + m_strcpy(buf, sizeof(buf), fixed); goto retry_name; case -1: return; } } - 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); if (adr) - strfcpy (buf, adr->mailbox, sizeof (buf)); + m_strcpy(buf, sizeof(buf), adr->mailbox); else buf[0] = 0; @@ -283,8 +285,8 @@ retry_name: } while (new->addr == NULL); - if (adr && adr->personal && !mutt_is_mail_list (adr)) - strfcpy (buf, adr->personal, sizeof (buf)); + if (adr && adr->personal && !mutt_is_mail_list(adr)) + m_strcpy(buf, sizeof(buf), adr->personal); else buf[0] = 0; @@ -292,7 +294,7 @@ retry_name: 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); @@ -310,15 +312,15 @@ retry_name: else Aliases = new; - strfcpy (buf, NONULL (AliasFile), sizeof (buf)); + m_strcpy(buf, sizeof(buf), NONULL(AliasFile)); if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0) return; mutt_expand_path (buf, sizeof (buf)); if ((rc = safe_fopen (buf, "a"))) { if (mutt_check_alias_name (new->name, NULL)) - mutt_quote_filename (buf, sizeof (buf), new->name); + mutt_quote_filename(buf, sizeof(buf), new->name); else - strfcpy (buf, new->name, sizeof (buf)); + m_strcpy(buf, sizeof(buf), new->name); fprintf (rc, "alias %s ", buf); buf[0] = 0; rfc822_write_address (buf, sizeof (buf), new->addr, 0); @@ -402,13 +404,13 @@ int mutt_alias_complete (char *s, size_t buflen) #define min(a,b) ((aname && strstr (a->name, s) == a->name) { if (!bestname[0]) /* init */ - strfcpy (bestname, a->name, - min (str_len (a->name) + 1, sizeof (bestname))); + m_strcpy(bestname, MIN(m_strlen(a->name) + 1, sizeof(bestname)), + a->name); else { for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++); bestname[i] = 0; @@ -418,9 +420,9 @@ int mutt_alias_complete (char *s, size_t buflen) } 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); + m_strcpy(s, m_strlen(bestname) + 1, bestname); return 1; } @@ -430,9 +432,9 @@ int mutt_alias_complete (char *s, size_t buflen) 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)); @@ -446,13 +448,13 @@ int mutt_alias_complete (char *s, size_t buflen) bestname[0] = 0; mutt_alias_menu (bestname, sizeof (bestname), a_list ? a_list : Aliases); if (bestname[0] != 0) - strfcpy (s, bestname, buflen); + m_strcpy(s, buflen, bestname); /* free the alias list */ 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 */ @@ -596,7 +598,7 @@ static int alias_SortAlias (const void *a, const void *b) { 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)); } @@ -615,7 +617,7 @@ static int alias_SortAddress (const void *a, const void *b) 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; } @@ -666,7 +668,7 @@ new_aliases: 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++) { @@ -730,6 +732,6 @@ new_aliases: } mutt_menuDestroy (&menu); - mem_free (&AliasTable); + p_delete(&AliasTable); }