#include <grp.h>
#include <pwd.h>
-#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-sys/unix.h>
-#include <lib-mx/mx.h>
+#include <imap/imap.h>
#include "alias.h"
#include "mutt.h"
#include "attach.h"
-#include "version.h"
-
-#include <imap/imap.h>
-
-#include <lib-crypt/crypt.h>
-
-#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
+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
{
int fd;
- fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(Tempdir) : dir, s);
+ fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(mod_core.tmpdir) : dir, s);
if (fd < 0) {
*s = '\0';
} else {
}
}
-/* returns true if the header contained in "s" is in list "t" */
-int mutt_matches_ignore (const char *s, string_list_t * t)
+void mutt_mktemp(char *s)
{
- for (; t; t = t->next) {
- if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
- || *t->data == '*')
- return 1;
- }
- return 0;
+ int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(mod_core.tmpdir), NULL);
+ if (fd < 0) {
+ *s = '\0';
+ } else {
+ close(fd);
+ unlink(s);
+ }
}
-ssize_t _mutt_expand_path(char *s, ssize_t slen, int rx)
+ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
{
char p[_POSIX_PATH_MAX] = "";
char tmp[_POSIX_PATH_MAX];
const char *tail = "";
+ const address_t *alias;
- do {
- const address_t *alias;
-
- switch (*s) {
- case '~':
- if (s[1] == '/' || s[1] == '\0') {
- m_strcpy(p, sizeof(p), Homedir);
- tail = s + 1;
- } else {
- struct passwd *pw;
- tail = m_strchrnul(s + 1, '/');
+ switch (*s) {
+ case '~':
+ if (s[1] == '/' || s[1] == '\0') {
+ m_strcpy(p, sizeof(p), mod_core.homedir);
+ tail = s + 1;
+ } else {
+ struct passwd *pw;
+ tail = m_strchrnul(s + 1, '/');
- m_strncpy(tmp, sizeof(tmp), s + 1, tail - s - 1);
+ m_strncpy(tmp, sizeof(tmp), s + 1, tail - s - 1);
- if ((pw = getpwnam(tmp))) {
- m_strcpy(p, sizeof(p), pw->pw_dir);
- } else {
- /* user not found! */
- tail = s;
- }
- }
- break;
-
- case '=':
- case '+':
- /* if folder = imap[s]://host/: don't append slash */
- if (imap_is_magic(NONULL(Maildir), NULL) == M_IMAP
- && Maildir[m_strlen(Maildir) - 1] == '/') {
- m_strcpy(p, sizeof(p), Maildir);
+ if ((pw = getpwnam(tmp))) {
+ m_strcpy(p, sizeof(p), pw->pw_dir);
} else {
- snprintf(p, sizeof(p), "%s/", NONULL(Maildir));
+ /* user not found! */
+ tail = s;
}
+ }
+ break;
- tail = s + 1;
- break;
-
- /* elm compatibility, @ expands alias to user name */
-
- case '@':
- if ((alias = alias_lookup(s + 1))) {
- HEADER h;
- header_init(&h);
- h.env = envelope_new();
- h.env->from = h.env->to = (address_t *)alias;
- mutt_default_save(p, sizeof (p), &h);
- h.env->from = h.env->to = NULL;
- header_wipe(&h);
-
- if (*p != '@') {
- /* recurse iff the result do not starts with '@' */
- m_strcpy(s, slen, p);
- continue;
- }
- }
- break;
+ case '=':
+ case '+':
+ /* if folder = imap[s]://host/: don't append slash */
+ if (imap_mx.mx_is_magic(NONULL(Maildir), NULL) == M_IMAP
+ && Maildir[m_strlen(Maildir) - 1] == '/') {
+ m_strcpy(p, sizeof(p), Maildir);
+ } else {
+ snprintf(p, sizeof(p), "%s/", NONULL(Maildir));
+ }
- case '>':
- m_strcpy(p, sizeof(p), Inbox);
- tail = s + 1;
- break;
+ tail = s + 1;
+ break;
- case '<':
- m_strcpy(p, sizeof(p), Outbox);
- tail = s + 1;
- break;
+ /* elm compatibility, @ expands alias to user name */
- case '!':
- if (s[1] == '!') {
- m_strcpy(p, sizeof(p), LastFolder);
- tail = s + 2;
- } else {
- m_strcpy(p, sizeof(p), Spoolfile);
- tail = s + 1;
- }
- break;
+ case '@':
+ if ((alias = alias_lookup(s + 1))) {
+ HEADER h;
+ header_init(&h);
+ h.env = envelope_new();
+ h.env->from = h.env->to = (address_t *)alias;
+ mutt_default_save(p, sizeof (p), &h);
+ h.env->from = h.env->to = NULL;
+ header_wipe(&h);
- case '-':
- m_strcpy(p, sizeof(p), NONULL(LastFolder));
- tail = s + 1;
- break;
+ if (*p != '@')
+ return _mutt_expand_path(buf, len, p, rx);
+ }
+ break;
- case '^':
- m_strcpy(p, sizeof(p), NONULL(CurrentFolder));
- tail = s + 1;
- break;
+ case '>':
+ m_strcpy(p, sizeof(p), Inbox);
+ tail = s + 1;
+ break;
+
+ case '<':
+ m_strcpy(p, sizeof(p), MAlias.record);
+ tail = s + 1;
+ break;
- default:
- *p = '\0';
- tail = s;
+ case '!':
+ if (s[1] == '!') {
+ m_strcpy(p, sizeof(p), LastFolder);
+ tail = s + 2;
+ } else {
+ m_strcpy(p, sizeof(p), Spoolfile);
+ tail = s + 1;
}
- } while (0);
+ break;
+
+ case '-':
+ m_strcpy(p, sizeof(p), NONULL(LastFolder));
+ tail = s + 1;
+ break;
+
+ case '^':
+ m_strcpy(p, sizeof(p), NONULL(CurrentFolder));
+ tail = s + 1;
+ break;
+
+ default:
+ *p = '\0';
+ tail = s;
+ }
if (rx) {
char q[_POSIX_PATH_MAX];
snprintf(tmp, sizeof(tmp), "%s%s", p, tail);
}
- return m_strcpy(s, slen, tmp);
-}
-
-void mutt_mktemp(char *s)
-{
- int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(Tempdir), NULL);
- if (fd < 0) {
- *s = '\0';
- } else {
- close(fd);
- unlink(s);
- }
+ return m_strcpy(buf, len, tmp);
}
/* collapse the pathname using ~ or = when possible */
/* if s is an url, only collapse path component */
if (scheme != U_UNKNOWN) {
p = strchr (s, ':') + 1;
- if (!strncmp (p, "//", 2))
+ if (!m_strncmp (p, "//", 2))
q = strchr (p + 2, '/');
if (!q)
q = strchr (p, '\0');
*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, 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';
}
}
-void mutt_FormatString (char *dest, /* output buffer */
- ssize_t destlen, /* output buffer len */
- const char *src, /* template string */
- format_t * callback, /* callback for processing */
- unsigned long data, /* callback data */
- format_flag flags)
-{ /* callback flags */
- char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
- char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
- ssize_t wlen, wid, count, col, len;
-
- prefix[0] = '\0';
- destlen--; /* save room for the terminal \0 */
- wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0;
- col = wlen;
-
- while (*src && wlen < destlen) {
- if (*src == '%') {
- if (*++src == '%') {
- *wptr++ = '%';
- wlen++;
- col++;
- src++;
- continue;
- }
-
- if (*src == '?') {
- flags |= M_FORMAT_OPTIONAL;
- src++;
- }
- else {
- flags &= ~M_FORMAT_OPTIONAL;
-
- /* eat the format string */
- cp = prefix;
- count = 0;
- while (count < ssizeof (prefix) &&
- (isdigit ((unsigned char) *src) || *src == '.' || *src == '-'))
- {
- *cp++ = *src++;
- count++;
- }
- *cp = 0;
- }
-
- if (!*src)
- break; /* bad format */
-
- ch = *src++; /* save the character to switch on */
-
- if (flags & M_FORMAT_OPTIONAL) {
- if (*src != '?')
- break; /* bad format */
- src++;
-
- /* eat the `if' part of the string */
- cp = ifstring;
- count = 0;
- while (count < ssizeof (ifstring) && *src && *src != '?'
- && *src != '&') {
- *cp++ = *src++;
- count++;
- }
- *cp = 0;
-
- /* eat the `else' part of the string (optional) */
- if (*src == '&')
- src++; /* skip the & */
- cp = elsestring;
- count = 0;
- while (count < ssizeof (elsestring) && *src && *src != '?') {
- *cp++ = *src++;
- count++;
- }
- *cp = 0;
-
- if (!*src)
- break; /* bad format */
-
- src++; /* move past the trailing `?' */
- }
-
- /* handle generic cases first */
- if (ch == '>') {
- /* right justify to EOL */
- ch = *src++; /* pad char */
- /* calculate space left on line. if we've already written more data
- than will fit on the line, ignore the rest of the line */
- if (DrawFullLine || option (OPTSTATUSONTOP))
- count = (COLS < destlen ? COLS : destlen);
- else
- count = ((COLS - SW) < destlen ? (COLS - SW) : destlen);
- if (count > col) {
- count -= col; /* how many columns left on this line */
- mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
- wid = m_strlen(buf);
- if (count > wid) {
- count -= wid; /* how many chars to pad */
- memset (wptr, ch, count);
- wptr += count;
- col += count;
- }
- if (wid + wlen > destlen)
- len = destlen - wlen;
- else
- len = wid;
- memcpy (wptr, buf, len);
- wptr += len;
- wlen += len;
- col += mutt_strwidth (buf);
- }
- break; /* skip rest of input */
- }
- else if (ch == '|') {
- /* pad to EOL */
- ch = *src++;
- if (destlen > COLS)
- destlen = COLS;
- if (destlen > wlen) {
- count = destlen - wlen;
- memset (wptr, ch, count);
- wptr += count;
- }
- break; /* skip rest of input */
- }
- else {
- short lower = 0;
- short nodots = 0;
-
- while (ch == '_' || ch == ':') {
- if (ch == '_')
- lower = 1;
- else if (ch == ':')
- nodots = 1;
-
- ch = *src++;
- }
-
- /* use callback function to handle this case */
- src =
- callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring,
- data, flags);
-
- if (lower)
- m_strtolower(buf);
- if (nodots) {
- char *p = buf;
-
- for (; *p; p++)
- if (*p == '.')
- *p = '_';
- }
-
- if ((len = m_strlen(buf)) + wlen > destlen)
- len = (destlen - wlen > 0) ? (destlen - wlen) : 0;
-
- memcpy (wptr, buf, len);
- wptr += len;
- wlen += len;
- col += mutt_strwidth (buf);
- }
- }
- else if (*src == '\\') {
- if (!*++src)
- break;
- switch (*src) {
- case 'n':
- *wptr = '\n';
- break;
- case 't':
- *wptr = '\t';
- break;
- case 'r':
- *wptr = '\r';
- break;
- case 'f':
- *wptr = '\f';
- break;
- case 'v':
- *wptr = '\v';
- break;
- default:
- *wptr = *src;
- break;
- }
- src++;
- wptr++;
- wlen++;
- col++;
- }
- else {
- unsigned int bar = strcspn(src, "%\\");
- char *bar2 = p_dupstr(src, bar);
-
- while (bar--) {
- *wptr++ = *src++;
- wlen++;
- }
- col += mutt_strwidth (bar2);
- p_delete(&bar2);
- }
- }
- *wptr = 0;
-}
-
/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
int mutt_save_confirm (const char *s, struct stat *st)
{
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 (int full)
-{
- static char vstring[STRING];
-
- if (full)
- snprintf (vstring, sizeof (vstring),
- "Madmutt/%s-r%s (based on Mutt 1.5.11)",
- MUTT_VERSION, MUTT_REVISION);
- else
- snprintf (vstring, sizeof (vstring), "Madmutt/%s-%s",
- MUTT_VERSION, MUTT_REVISION);
- 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);
+ return 0;
else
- return (1);
- }
- else {
- if (h1 == NULL && h2 == NULL)
- return (1);
- else
- return (0);
+ return 1;
}
+ return h1 == NULL && h2 == NULL;
}
if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE))
|| (ch == '#' && !(flags & M_TOKEN_COMMENT))
|| (ch == '=' && (flags & M_TOKEN_EQUAL))
- || (ch == ';' && !(flags & M_TOKEN_SEMICOLON))
|| ((flags & M_TOKEN_PATTERN) && strchr("~=!|", ch)))
{
break;
if (!*tok->dptr)
return -1; /* premature end of token */
mutt_buffer_addch(dest,
- (ascii_toupper(*tok->dptr) - 'A' + 1) & 0x7f);
+ (toupper((unsigned char)*tok->dptr) - 'A' + 1) & 0x7f);
tok->dptr++;
break;
case 'r':
mutt_buffer_addch(dest, '\033');
} else
if (isalpha((unsigned char)ch)) {
- mutt_buffer_addch(dest, ascii_toupper(ch) - 'A' + 1);
+ mutt_buffer_addch(dest, toupper((unsigned char)ch) - 'A' + 1);
} else {
mutt_buffer_addch(dest, '^');
mutt_buffer_addch(dest, ch);
}
} while (pc && *pc != '`');
if (!pc) {
- return (-1);
+ return -1;
}
cmd = p_dupstr(tok->dptr, pc - tok->dptr);
tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
ptr = xmalloc(tok->dsize);
memcpy(ptr, expn.data, expnlen);
- strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
+ m_strcpy(ptr + expnlen, tok->dsize - expnlen, tok->dptr);
if (tok->destroy)
p_delete(&tok->data);
tok->data = ptr;
projects / apps / madmutt.git / blobdiff