#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include "keymap.h"
#include "pager.h"
#include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
int mutt_get_tmp_attachment (BODY * a)
{
/* Remove headers by copying out data to another file, then
* copying the file back */
fseeko (fp, b->offset, 0);
- tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (!tfp) {
mutt_perror (_("Failure to open file to strip headers."));
goto bailout;
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
if (m_strcmp(p, "1") == 0)
- return (1);
+ return 1;
m_strcpy(tmp, sizeof(tmp), p);
p = tmp;
if ((q = strrchr (p, '/')) != NULL) {
if (*(q + 1) == '*') {
if (ascii_strncasecmp (buf, p, q - p) == 0)
- return (1);
+ return 1;
} else {
if (ascii_strcasecmp (buf, p) == 0)
- return (1);
+ return 1;
}
} else {
lng = m_strlen(p);
if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
- return (1);
+ return 1;
}
p = NULL;
}
}
- return (0);
+ return 0;
}
void mutt_check_lookup_list (BODY * b, char *type, int len)
if (use_pager) {
/* recv case */
- pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(MCore.tmpdir),
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(mod_core.tmpdir),
fp && !use_mailcap ? a->filename : NULL);
}
/* We only reach this point if there have been no errors */
if (use_pager) {
- pager_t info;
- p_clear(&info, 1);
-
- info.fp = fp;
- info.bdy = a;
- info.ctx = Context;
- info.idx = idx;
- info.idxlen = idxlen;
- info.hdr = hdr;
-
- rc = mutt_do_pager(descrip, pagerfile,
- M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
- &info);
+ pager_t info = { Context, hdr, a, fp, idx, idxlen };
+ rc = mutt_pager(descrip, pagerfile,
+ M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+ &info);
*pagerfile = '\0';
}
else
mx_close_mailbox (&ctx, NULL);
return -1;
}
- if (ctx.magic == M_MBOX || ctx.magic == M_MMDF)
+ if (ctx.magic == M_MBOX)
chflags = CH_FROM;
chflags |= (ctx.magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
if (_mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags) == 0
if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
- return (-1);
+ return -1;
}
fseeko ((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (m_fclose(&s.fpout) != 0) {
mutt_perror ("fclose");
- return (-1);
+ return -1;
}
}
} else {
if ((ofp = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
- return (-1);
+ return -1;
}
if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
m_fclose(&ofp);
- return (-1);
+ return -1;
}
if (mutt_copy_stream (ofp, nfp) == -1) {
m_fclose(&ofp);
m_fclose(&nfp);
- return (-1);
+ return -1;
}
m_fclose(&ofp);
m_fclose(&nfp);
if (s.fpout == NULL) {
close(pathfd);
mutt_perror ("fopen");
- return (-1);
+ return -1;
}
if (fp == NULL) {
if (stat (m->filename, &st) == -1) {
mutt_perror ("stat");
m_fclose(&s.fpout);
- return (-1);
+ return -1;
}
if ((s.fpin = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
- return (-1);
+ return -1;
}
saved_encoding = m->encoding;
m_fclose(&s.fpin);
}
- return (0);
+ return 0;
}
/* Ok, the difference between send and receive:
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
rfc1524_entry_delete(&entry);
- return (0);
+ return 0;
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
unlink (newfile);
rfc1524_entry_delete(&entry);
- return (1);
+ return 1;
}
tok = mime_which_token(type, -1);
ifp = NULL;
fpout = NULL;
- newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(MCore.tmpdir), NULL);
+ newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(mod_core.tmpdir), NULL);
if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
if ((ifp = fopen(newfile, "r")) == NULL) {
if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) ||
(fp = safe_fopen (hdr->content->filename, "r")) == NULL)
- return (0);
+ return 0;
while (!found && fgets (buf, sizeof (buf), fp)) {
p = buf;
}
m_fclose(&fp);
- return (found);
+ return found;
}