#include <grp.h>
#include <pwd.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-sys/unix.h>
#include <imap/imap.h>
#include "mutt.h"
#include "attach.h"
+const char *madmutt_version = "Madmutt/" MUTT_VERSION;
+
/* Modified by blong to accept a "suggestion" for file name. If
* that file exists, then construct one with unique name but
* keep any extension. This might fail, I guess.
{
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);
tmp[0] = 0;
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
- return (-1);
+ return -1;
mutt_concat_path(fname, flen, path, tmp);
}
else
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';
return 1;
}
-#ifdef USE_NNTP
- if (magic == M_NNTP) {
- mutt_error _("Can't save message to newsserver.");
-
- return 0;
- }
-#endif
-
if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
(!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
}
}
}
-
- CLEARLINE (LINES - 1);
- return (ret);
+ return ret;
}
void mutt_sleep (short s)
sleep(MAX(s, SleepTime));
}
-const char *mutt_make_version(void)
-{
- static char vstring[STRING];
- snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION);
- return vstring;
-}
-
/* return 1 if address lists are strictly identical */
static int mutt_cmp_addr (const address_t * a, const address_t * b)
{
while (a && b) {
if (m_strcmp(a->mailbox, b->mailbox) ||
m_strcmp(a->personal, b->personal))
- return (0);
+ return 0;
a = a->next;
b = b->next;
}
- if (a || b)
- return (0);
-
- return (1);
+ return !(a || b);
}
static int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
{
while (a && b) {
if (m_strcmp(a->data, b->data))
- return (0);
+ return 0;
a = a->next;
b = b->next;
}
- if (a || b)
- return (0);
-
- return (1);
+ return !(a || b);
}
static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
!mutt_cmp_addr (e1->to, e2->to) ||
!mutt_cmp_addr (e1->cc, e2->cc) ||
!mutt_cmp_addr (e1->return_path, e2->return_path))
- return (0);
+ return 0;
else
- return (1);
- }
- else {
- if (e1 == NULL && e2 == NULL)
- return (1);
- else
- return (0);
+ return 1;
}
+ return e1 == NULL && e2 == NULL;
}
static int mutt_cmp_body (const BODY * b1, const BODY * b2)
m_strcmp(b1->description, b2->description) ||
!parameter_equal(b1->parameter, b2->parameter) ||
b1->length != b2->length)
- return (0);
- return (1);
+ return 0;
+ return 1;
}
int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
if (h1 && h2) {
h1->mime != h2->mime ||
!mutt_cmp_env (h1->env, h2->env) ||
!mutt_cmp_body (h1->content, h2->content))
- return (0);
- else
- return (1);
- }
- else {
- if (h1 == NULL && h2 == NULL)
- return (1);
+ return 0;
else
- return (0);
+ return 1;
}
+ return h1 == NULL && h2 == NULL;
}
}
} while (pc && *pc != '`');
if (!pc) {
- return (-1);
+ return -1;
}
cmd = p_dupstr(tok->dptr, pc - tok->dptr);