#include <grp.h>
#include <pwd.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-sys/unix.h>
#include <imap/imap.h>
{
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 {
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 {
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;
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, 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);
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';
}
}
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
return (ret);
}