oops, d can be NULL !

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 6b13773..5eab9db 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -160,7 +160,8 @@ static int alias_sanitize(const char *s, char *d)
         s++;
     }
 
-    *d = '\0';
+    if (d)
+        *d = '\0';
     return rv;
 }
 
@@ -197,7 +198,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 +273,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,9 +299,9 @@ 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);
-        fclose(rc);
+        m_fclose(&rc);
         mutt_message _("Alias added.");
     } else {
         mutt_perror(buf);
@@ -355,9 +356,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;
@@ -481,25 +480,25 @@ int mutt_alias_complete (char *s, size_t buflen)
   return 0;
 }
 
-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)))
+static const char *
+alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
+                 const char *fmt, const char *ifstr __attribute__ ((unused)),
+                 const char *elstr __attribute__ ((unused)),
+                 anytype data, format_flag flags __attribute__ ((unused)))
 {
-  char tmp[SHORT_STRING], adr[SHORT_STRING];
-  alias_t *alias = (alias_t *) data;
+  char tmp[STRING], adr[STRING];
+  alias_t *alias = data.ptr;
 
   switch (op) {
   case 'f':
-    m_strcpy(dest, destlen, alias->del ? "D" : " ");
+    m_strputc(dest, destlen, alias->del ? 'D' : ' ');
     break;
   case 'a':
     mutt_format_s(dest, destlen, fmt, alias->name);
     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;
@@ -508,18 +507,18 @@ static const format_t *alias_format_str (char *dest, size_t destlen, char op,
     snprintf(dest, destlen, tmp, alias->num + 1);
     break;
   case 't':
-    m_strcpy(dest, destlen, alias->tagged ? "*" : " ");
+    m_strputc(dest, destlen, alias->tagged ? '*' : ' ');
     break;
   }
 
-  return (src);
+  return src;
 }
 
-static void alias_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
+static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
 {
-  mutt_FormatString (s, slen, NONULL (AliasFmt), (format_t *)alias_format_str,
-                     (unsigned long)((alias_t **)m->data)[num],
-                     M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, COLS - SW, AliasFmt, alias_format_str,
+                ((alias_t **)m->data)[num],
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static int alias_tag (MUTTMENU * menu, int n, int m)
@@ -574,7 +573,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;
 
@@ -659,14 +658,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);