u->data = m_strdup(a->mailbox);
u->next = *expn;
*expn = u;
- w = rfc822_cpy_adr (t);
+ w = address_list_dup (t);
w = mutt_expand_aliases_r (w, expn);
if (head)
last->next = w;
char namebuf[STRING];
mutt_gecos_name (namebuf, sizeof (namebuf), pw);
- str_replace (&a->personal, namebuf);
+ m_strreplace (&a->personal, namebuf);
}
}
}
while (a) {
if (a->name && strstr (a->name, s) == a->name) {
if (!bestname[0]) /* init */
- m_strcpy(bestname, MIN(m_strlen(a->name) + 1, sizeof(bestname)),
+ m_strcpy(bestname, MIN(m_strlen(a->name) + 1, ssizeof(bestname)),
a->name);
else {
for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
return 0;
}
-static const char *alias_format_str (char *dest, size_t destlen, char op,
- const char *src, const char *fmt,
- const char *ifstring,
- const char *elsestring,
- unsigned long data, format_flag flags)
+static const format_t *alias_format_str (char *dest, size_t destlen, char op,
+ const format_t *src, const char *fmt,
+ const char *ifstring __attribute__ ((unused)),
+ const char *elsestring __attribute__ ((unused)),
+ unsigned long data, format_flag flags __attribute__ ((unused)))
{
char tmp[SHORT_STRING], adr[SHORT_STRING];
ALIAS *alias = (ALIAS *) data;
switch (op) {
case 'f':
- snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
- snprintf (dest, destlen, tmp, alias->del ? "D" : " ");
+ if(alias->del)
+ m_strcpy (dest, sizeof(dest), "D");
+ else
+ m_strcpy (dest, sizeof(dest), " ");
break;
case 'a':
mutt_format_s (dest, destlen, fmt, alias->name);
static void alias_entry (char *s, size_t slen, MUTTMENU * m, int num)
{
- mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str,
+ mutt_FormatString (s, slen, NONULL (AliasFmt), (format_t *) alias_format_str,
(unsigned long) ((ALIAS **) m->data)[num],
M_FORMAT_ARROWCURSOR);
}