{
int fd;
- fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(Tempdir) : dir, s);
+ fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(MCore.tmpdir) : dir, s);
if (fd < 0) {
*s = '\0';
} else {
void mutt_mktemp(char *s)
{
- int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(Tempdir), NULL);
+ int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(MCore.tmpdir), NULL);
if (fd < 0) {
*s = '\0';
} else {
switch (*s) {
case '~':
if (s[1] == '/' || s[1] == '\0') {
- m_strcpy(p, sizeof(p), Homedir);
+ m_strcpy(p, sizeof(p), MCore.homedir);
tail = s + 1;
} else {
struct passwd *pw;
break;
case '<':
- m_strcpy(p, sizeof(p), Outbox);
+ m_strcpy(p, sizeof(p), MAlias.record);
tail = s + 1;
break;
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 &&
- s[len] == '/') {
+ else if (m_strncmp(s, MCore.homedir, (len = m_strlen(MCore.homedir))) == 0
+ && s[len] == '/') {
*s++ = '~';
memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
}
void mutt_save_path(char *d, ssize_t dsize, address_t *a)
{
if (a && a->mailbox) {
- m_strcpy(d, dsize, a->mailbox);
-
- if (!option(OPTSAVEADDRESS)) {
- char *p = strpbrk(d, "%@");
- if (p)
- *p = '\0';
- }
+ m_strncpy(d, dsize, a->mailbox, strcspn(d, "%@"));
m_strtolower(d);
} else {
*d = '\0';