X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=f9d7b77c5fa0a8d8e480ebd1d8ac6d8873209ec2;hp=835d55a4af6747829b9a98702712022ff6eaaa7c;hb=13ce824381b10ea5a66d6ec6177863e4a5e73639;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc

diff --git a/alias.c b/alias.c
index 835d55a..f9d7b77 100644
--- a/alias.c
+++ b/alias.c
@@ -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 {
@@ -101,7 +101,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
           char namebuf[STRING];
 
           mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-          str_replace (&a->personal, namebuf);
+          m_strreplace (&a->personal, namebuf);
         }
       }
     }
@@ -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;
@@ -409,7 +409,7 @@ int mutt_alias_complete (char *s, size_t buflen)
     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++);
@@ -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) {
@@ -541,19 +541,21 @@ int mutt_addr_is_user (ADDRESS * addr)
   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);
@@ -579,7 +581,7 @@ static const char *alias_format_str (char *dest, size_t destlen, char op,
 
 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);
 }
@@ -605,8 +607,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)