push username, homedir and tmpdir in lua too.

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 18fac2b..03482c6 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -107,10 +107,10 @@ int mutt_addr_is_user(address_t *addr)
     if (!addr->mailbox)
         return 0;
 
-    if (!ascii_strcasecmp(addr->mailbox, Username)
-    ||  string_is_address(addr->mailbox, Username, Hostname)
-    ||  string_is_address(addr->mailbox, Username, mutt_fqdn(0))
-    ||  string_is_address(addr->mailbox, Username, mutt_fqdn(1))
+    if (!ascii_strcasecmp(addr->mailbox, MCore.username)
+    ||  string_is_address(addr->mailbox, MCore.username, Hostname)
+    ||  string_is_address(addr->mailbox, MCore.username, mutt_fqdn(0))
+    ||  string_is_address(addr->mailbox, MCore.username, mutt_fqdn(1))
     ||  (From && !ascii_strcasecmp(From->mailbox, addr->mailbox)))
     {
         return 1;
@@ -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) {
@@ -513,10 +514,11 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *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)
 {
-  m_strformat(s, slen, 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)