X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=bf59e688fd98c05c16f4f1bfc0a263f6fd0b59a8;hp=c595af694a17b8ca5b6ec5ec170df12201aa4a7c;hb=9946738a6a1c27a5602a14d1afe2eea2389732b2;hpb=8a0ec16b6cd58dc1bd73baae43fd62de24d63604 diff --git a/muttlib.c b/muttlib.c index c595af6..bf59e68 100644 --- a/muttlib.c +++ b/muttlib.c @@ -32,7 +32,7 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l) { int fd; - fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(MCore.tmpdir) : dir, s); + fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(mod_core.tmpdir) : dir, s); if (fd < 0) { *s = '\0'; } else { @@ -43,7 +43,7 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l) void mutt_mktemp(char *s) { - int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(MCore.tmpdir), NULL); + int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(mod_core.tmpdir), NULL); if (fd < 0) { *s = '\0'; } else { @@ -62,7 +62,7 @@ ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx) switch (*s) { case '~': if (s[1] == '/' || s[1] == '\0') { - m_strcpy(p, sizeof(p), MCore.homedir); + m_strcpy(p, sizeof(p), mod_core.homedir); tail = s + 1; } else { struct passwd *pw; @@ -199,7 +199,7 @@ void mutt_pretty_mailbox (char *s) *s++ = '='; memmove (s, s + len, m_strlen(s + len) + 1); } - else if (m_strncmp(s, MCore.homedir, (len = m_strlen(MCore.homedir))) == 0 + else if (m_strncmp(s, mod_core.homedir, (len = m_strlen(mod_core.homedir))) == 0 && s[len] == '/') { *s++ = '~'; memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);