cosmetics++

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 4602176..8d48a78 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -25,20 +25,7 @@
  * 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>
 
@@ -66,6 +53,8 @@ static struct mapping_t AliasHelp[] = {
     {NULL, OP_NULL}
 };
 
+static void mutt_alias_menu(char *, size_t, alias_t *);
+
 const address_t *alias_lookup(const char *s)
 {
     alias_t *list;
@@ -311,7 +300,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
         buf[0] = '\0';
         rfc822_write_address(buf, sizeof(buf), new->addr, 0);
         write_safe_address(rc, buf);
-        fclose(rc);
+        m_fclose(&rc);
         mutt_message _("Alias added.");
     } else {
         mutt_perror(buf);
@@ -366,9 +355,7 @@ static address_t *mutt_expand_aliases_r(address_t *a, string_list_t **expn)
 
     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;
@@ -381,7 +368,8 @@ address_t *mutt_expand_aliases(address_t *a)
 
     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)