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;
s++;
}
- *d = '\0';
+ if (d)
+ *d = '\0';
return rv;
}
return;
}
- mutt_expand_path(buf, sizeof (buf));
+ mutt_expand_path(buf, sizeof(buf));
rc = safe_fopen (buf, "a");
if (rc) {
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)