void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
{
- char buf[LONG_STRING], prompt[SHORT_STRING];
+ char buf[LONG_STRING], prompt[STRING];
address_t *adr = iadr;
alias_t *new;
FILE *rc;
new->addr->personal = m_strdup(buf);
buf[0] = '\0';
- rfc822_write_address(buf, sizeof(buf), new->addr, 1);
+ rfc822_addrcat(buf, sizeof(buf), new->addr, 1);
snprintf(prompt, sizeof(prompt), _("[%s = %s] Accept?"), new->name, buf);
if (mutt_yesorno(prompt, M_YES) != M_YES) {
alias_list_wipe(&new);
}
buf[0] = '\0';
- rfc822_write_address(buf, sizeof(buf), new->addr, 0);
+ rfc822_addrcat(buf, sizeof(buf), new->addr, 0);
write_safe_address(rc, buf);
- fclose(rc);
+ m_fclose(&rc);
mutt_message _("Alias added.");
} else {
mutt_perror(buf);
if (option(OPTUSEDOMAIN)) {
/* now qualify all local addresses */
- const char *fqdn = mutt_fqdn(1);
- if (fqdn)
- rfc822_qualify(head, fqdn);
+ rfc822_qualify(head, mutt_fqdn(1));
}
return head;
const char *elsestring __attribute__ ((unused)),
unsigned long data, format_flag flags __attribute__ ((unused)))
{
- char tmp[SHORT_STRING], adr[SHORT_STRING];
+ char tmp[STRING], adr[STRING];
alias_t *alias = (alias_t *) data;
switch (op) {
break;
case 'r':
adr[0] = '\0';
- rfc822_write_address(adr, sizeof(adr), alias->addr, 1);
+ rfc822_addrcat(adr, sizeof(adr), alias->addr, 1);
snprintf(tmp, sizeof(tmp), "%%%ss", fmt);
snprintf(dest, destlen, tmp, adr);
break;
static void alias_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
- mutt_FormatString (s, slen, NONULL (AliasFmt), (format_t *)alias_format_str,
+ m_strformat (s, slen, NONULL (AliasFmt), (format_t *)alias_format_str,
(unsigned long)((alias_t **)m->data)[num],
- M_FORMAT_ARROWCURSOR);
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static int alias_tag (MUTTMENU * menu, int n, int m)
int t = -1;
int i, done = 0;
int op;
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
int omax;
for (i = 0; i < menu->max; i++) {
if (AliasTable[i]->tagged) {
mutt_addrlist_to_local (AliasTable[i]->addr);
- rfc822_write_address (buf, buflen, AliasTable[i]->addr, 0);
+ rfc822_addrcat(buf, buflen, AliasTable[i]->addr, 0);
t = -1;
}
}
if (t != -1) {
mutt_addrlist_to_local (AliasTable[t]->addr);
- rfc822_write_address (buf, buflen, AliasTable[t]->addr, 0);
+ rfc822_addrcat(buf, buflen, AliasTable[t]->addr, 0);
}
mutt_menuDestroy (&menu);