* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <ctype.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-lib/mapping.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
{NULL, OP_NULL}
};
+static void mutt_alias_menu(char *, size_t, alias_t *);
+
const address_t *alias_lookup(const char *s)
{
alias_t *list;
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;
t = mutt_expand_aliases_r(a, &expn);
string_list_wipe(&expn);
- return mutt_remove_duplicates(t);
+ address_list_uniq(t);
+ return t;
}
void mutt_expand_aliases_env(ENVELOPE *env)
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;
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);