X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=84eda4d9b79e3b3c2c273561bbfd055272e7167b;hp=8d48a78305fcd6ff678997e0e1c5102ac038d646;hb=688ac22f746f785c27ac99ac86aa85a3035a3638;hpb=22116d7063ab4d7de33946d74ab8b9cbc0f3f6ef

diff --git a/alias.c b/alias.c
index 8d48a78..84eda4d 100644
--- a/alias.c
+++ b/alias.c
@@ -197,7 +197,7 @@ static void write_safe_address(FILE *fp, const char *s)
 
 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;
@@ -272,7 +272,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
     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);
@@ -298,7 +298,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
         }
 
         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);
         m_fclose(&rc);
         mutt_message _("Alias added.");
@@ -485,7 +485,7 @@ static const format_t *alias_format_str (char *dest, size_t destlen, char op,
                                      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) {
@@ -497,7 +497,7 @@ static const format_t *alias_format_str (char *dest, size_t destlen, char 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;
@@ -572,7 +572,7 @@ void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)
   int t = -1;
   int i, done = 0;
   int op;
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
 
   int omax;
 
@@ -657,14 +657,14 @@ new_aliases:
   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);