X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=f1021efa1d74a77bf4c7fc4713eb38a51523be73;hp=f566cec02c513db256d5076f3931baf4751efe57;hb=892df7e70376da43374d834b8a825ea2d59efd06;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2

diff --git a/alias.c b/alias.c
index f566cec..f1021ef 100644
--- 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;
 }
 
@@ -286,7 +287,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
         return;
     }
 
-    mutt_expand_path(buf, sizeof (buf));
+    mutt_expand_path(buf, sizeof(buf));
     rc = safe_fopen (buf, "a");
 
     if (rc) {
@@ -490,7 +491,7 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
 
   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);
@@ -506,18 +507,18 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
     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;
 }
 
-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)
 {
-  m_strformat(s, slen, NONULL (AliasFmt), alias_format_str,
-              ((alias_t **)m->data)[num],
-              option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    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)