X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=9be40dc180c568a835df57b6abe071858d225bf2;hp=b43689bb84382b7a01175e77659031a86aa3531f;hb=d0dc8fb657cff90709c15d4b106415b868857f6a;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/alias.c b/alias.c
index b43689b..9be40dc 100644
--- a/alias.c
+++ b/alias.c
@@ -19,6 +19,7 @@
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "lib/rx.h"
 #include "lib/debug.h"
@@ -28,7 +29,6 @@
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 
 #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
@@ -42,7 +42,7 @@ static struct mapping_t AliasHelp[] = {
   {NULL, OP_NULL}
 };
 
-ADDRESS *mutt_lookup_alias (const char *s)
+address_t *mutt_lookup_alias (const char *s)
 {
   ALIAS *t = Aliases;
 
@@ -52,9 +52,9 @@ ADDRESS *mutt_lookup_alias (const char *s)
   return (NULL);                /* no such alias */
 }
 
-static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
+static address_t *mutt_expand_aliases_r (address_t * a, LIST ** expn)
 {
-  ADDRESS *head = NULL, *last = NULL, *t, *w;
+  address_t *head = NULL, *last = NULL, *t, *w;
   LIST *u;
   char i;
   const char *fqdn;
@@ -79,7 +79,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
           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;
@@ -91,7 +91,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
         t = a;
         a = a->next;
         t->next = NULL;
-        rfc822_free_address (&t);
+        address_delete (&t);
         continue;
       }
       else {
@@ -124,9 +124,9 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
   return (head);
 }
 
-ADDRESS *mutt_expand_aliases (ADDRESS * a)
+address_t *mutt_expand_aliases (address_t * a)
 {
-  ADDRESS *t;
+  address_t *t;
   LIST *expn = NULL;            /* previously expanded aliases to avoid loops */
 
   t = mutt_expand_aliases_r (a, &expn);
@@ -176,9 +176,9 @@ static void write_safe_address (FILE * fp, char *s)
   }
 }
 
-ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
+address_t *mutt_get_address (ENVELOPE * env, const char **pfxp)
 {
-  ADDRESS *adr;
+  address_t *adr;
   const char *pfx = NULL;
 
   if (mutt_addr_is_user (env->from)) {
@@ -206,14 +206,14 @@ ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
   return adr;
 }
 
-void mutt_create_alias (ENVELOPE * cur, ADDRESS * iadr)
+void mutt_create_alias (ENVELOPE * cur, address_t * iadr)
 {
   ALIAS *new, *t;
   char buf[LONG_STRING], prompt[SHORT_STRING], *pc;
   char *err = NULL;
   char fixed[LONG_STRING];
   FILE *rc;
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
 
   if (cur) {
     adr = mutt_get_address (cur, NULL);
@@ -369,10 +369,10 @@ int mutt_check_alias_name (const char *s, char *d)
  * This routine looks to see if the user has an alias defined for the given
  * address.
  */
-ADDRESS *alias_reverse_lookup (ADDRESS * a)
+address_t *alias_reverse_lookup (address_t * a)
 {
   ALIAS *t = Aliases;
-  ADDRESS *ap;
+  address_t *ap;
 
   if (!a || !a->mailbox)
     return NULL;
@@ -495,7 +495,7 @@ static int string_is_address (const char *str, const char *u, const char *d)
 }
 
 /* returns TRUE if the given address belongs to the user. */
-int mutt_addr_is_user (ADDRESS * addr)
+int mutt_addr_is_user (address_t * addr)
 {
   /* NULL address is assumed to be the user. */
   if (!addr) {
@@ -605,8 +605,8 @@ static int alias_SortAlias (const void *a, const void *b)
 
 static int alias_SortAddress (const void *a, const void *b)
 {
-  ADDRESS *pa = (*(ALIAS **) a)->addr;
-  ADDRESS *pb = (*(ALIAS **) b)->addr;
+  address_t *pa = (*(ALIAS **) a)->addr;
+  address_t *pb = (*(ALIAS **) b)->addr;
   int r;
 
   if (pa == pb)