* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
+#include <utime.h>
#include <lib-mime/mime.h>
+#include <lib-sys/exit.h>
+#include <lib-sys/unix.h>
+
+#include <lib-lua/lib-lua.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
+
#include "mutt.h"
-#include "enter.h"
+#include "alias.h"
#include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "sort.h"
#include "copy.h"
-#include "mx.h"
#include "pager.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include "mutt_idna.h"
-#include "rfc1524.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <imap/imap.h>
-#ifdef BUFFY_SIZE
-#include "buffy.h"
-#endif
-
-#include "lib/debug.h"
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
int mutt_display_message (HEADER * cur)
{
char tempfile[_POSIX_PATH_MAX], buf[LONG_STRING];
- int rc = 0, builtin = 0;
int cmflags = M_CM_DECODE | M_CM_DISPLAY | M_CM_CHARCONV;
FILE *fpout = NULL;
FILE *fpfilterout = NULL;
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
- mutt_mktemp (tempfile);
- if ((fpout = safe_fopen (tempfile, "w")) == NULL) {
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ if (!fpout) {
mutt_error _("Could not create temporary file!");
-
- return (0);
+ return 0;
}
if (DisplayFilter && *DisplayFilter) {
-1, fileno (fpfilterout), -1);
if (filterpid < 0) {
mutt_error (_("Cannot create display filter"));
- safe_fclose (&fpfilterout);
+ m_fclose(&fpfilterout);
unlink (tempfile);
return 0;
}
}
- if (!Pager || m_strcmp(Pager, "builtin") == 0)
- builtin = 1;
- else {
- mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
- fputs (buf, fpout);
- fputs ("\n\n", fpout);
- }
-
msg = mx_open_message (Context, cur->msgno);
if (msg == NULL) res = -1;
/* see if crytpo is needed for this message. if so, we should exit curses */
if (cur->security) {
if (cur->security & ENCRYPT) {
- if (cur->security & APPLICATION_SMIME)
- crypt_smime_getkeys (cur->env);
- if (!crypt_valid_passphrase (cur->security))
- return 0;
-
cmflags |= M_CM_VERIFY;
}
else if (cur->security & SIGN) {
}
if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
- if (cur->security & APPLICATION_PGP) {
- if (cur->env->from)
- crypt_pgp_invoke_getkeys (cur->env->from);
-
- crypt_invoke_message (APPLICATION_PGP);
- }
-
- if (cur->security & APPLICATION_SMIME)
- crypt_invoke_message (APPLICATION_SMIME);
+ crypt_invoke_message(cur->security);
}
res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE | CH_FROM);
if (res == 0 && (ferror(fpout) || feof(fpout))) {
- debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
res = -1;
}
mx_close_message (&msg);
}
- if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res == -1) {
+ if ((m_fclose(&fpout) != 0 && errno != EPIPE) || res == -1) {
mutt_error (_("Could not copy message"));
if (fpfilterout != NULL) {
mutt_wait_filter (filterpid);
- safe_fclose (&fpfilterout);
+ m_fclose(&fpfilterout);
}
-#if 0
- /* this is maybe just plain wrong but it makes the pager display
- * what we have; i.e. for the crypto stuff we only get
- * 'Could not copy message' for invalid passphrases, no PGP output
- * not nothing; so just display what we have...
- * - pdmef
- */
- mutt_unlink (tempfile);
- return 0;
-#endif
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
mutt_any_key_to_continue (NULL);
- safe_fclose (&fpfilterout); /* XXX - check result? */
+ m_fclose(&fpfilterout); /* XXX - check result? */
/* update crypto information for this message */
are color patterns for both ~g and ~V */
cur->pair = 0;
- if (builtin) {
- pager_t info;
-
- if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) {
- if (cur->security & GOODSIGN) {
- if (!crypt_smime_verify_sender (cur))
- mutt_message (_("S/MIME signature successfully verified."));
- else
- mutt_error (_("S/MIME certificate owner does not match sender."));
- }
- else if (cur->security & PARTSIGN)
- mutt_message (_
- ("Warning: Part of this message has not been signed."));
- else if (cur->security & SIGN || cur->security & BADSIGN)
- mutt_error (_("S/MIME signature could NOT be verified."));
+ if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) {
+ if (cur->security & GOODSIGN) {
+ if (!crypt_smime_verify_sender (cur))
+ mutt_message (_("S/MIME signature successfully verified."));
+ else
+ mutt_error (_("S/MIME certificate owner does not match sender."));
}
+ else if (cur->security & PARTSIGN)
+ mutt_message (_
+ ("Warning: Part of this message has not been signed."));
+ else if (cur->security & SIGN || cur->security & BADSIGN)
+ mutt_error (_("S/MIME signature could NOT be verified."));
+ }
- if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) {
- if (cur->security & GOODSIGN)
- mutt_message (_("PGP signature successfully verified."));
- else if (cur->security & PARTSIGN)
- mutt_message (_
- ("Warning: Part of this message has not been signed."));
- else if (cur->security & SIGN)
- mutt_message (_("PGP signature could NOT be verified."));
- }
+ if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) {
+ if (cur->security & GOODSIGN)
+ mutt_message (_("PGP signature successfully verified."));
+ else if (cur->security & PARTSIGN)
+ mutt_message (_
+ ("Warning: Part of this message has not been signed."));
+ else if (cur->security & SIGN)
+ mutt_message (_("PGP signature could NOT be verified."));
+ }
+
+ {
+ pager_t info;
- /* Invoke the builtin pager */
p_clear(&info, 1);
info.hdr = cur;
info.ctx = Context;
- rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
+ return mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
}
- else {
- int r;
-
- mutt_endwin (NULL);
- snprintf (buf, sizeof (buf), "%s %s", NONULL (Pager), tempfile);
- if ((r = mutt_system (buf)) == -1)
- mutt_error (_("Error running \"%s\"!"), buf);
- unlink (tempfile);
- keypad (stdscr, TRUE);
- if (r != -1)
- mutt_set_flag (Context, cur, M_READ, 1);
- if (r != -1 && option (OPTPROMPTAFTER)) {
- mutt_ungetch (mutt_any_key_to_continue _("Command: "), 0);
- rc = km_dokey (MENU_PAGER);
- }
- else
- rc = 0;
- }
-
- return rc;
}
void ci_bounce_message (HEADER * h, int *redraw)
{
- char prompt[SHORT_STRING];
+ char prompt[STRING];
char buf[HUGE_STRING] = { 0 };
address_t *adr = NULL;
char *err = NULL;
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
- address_delete (&adr);
+ address_list_wipe(&adr);
return;
}
buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), adr, 1);
+ rfc822_addrcat(buf, sizeof (buf), adr, 1);
#define extra_space (15 + 7 + 2)
snprintf (prompt, sizeof (prompt),
(h ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
- if (mutt_strwidth (prompt) > COLS - extra_space) {
+ if (m_strwidth(prompt) > COLS - extra_space) {
mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
prompt, sizeof(prompt), 0);
m_strcat(prompt, sizeof(prompt), "...?");
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
- address_delete (&adr);
+ address_list_wipe(&adr);
CLEARLINE (LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
CLEARLINE (LINES - 1);
rc = mutt_bounce_message (NULL, h, adr);
- address_delete (&adr);
+ address_list_wipe(&adr);
/* If no error, or background, display message. */
if ((rc == 0) || (rc == S_BKG))
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
pipe_set_flags (decode, print, &cmflags, &chflags);
if (decode && h->security & ENCRYPT) {
- if (!crypt_valid_passphrase (h->security))
- return;
endwin ();
}
if (decode) {
mutt_parse_mime_message (Context, h);
- if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security))
- return 1;
}
mutt_endwin (NULL);
}
pipe_msg (h, fpout, decode, print);
- fclose (fpout);
+ m_fclose(&fpout);
rc = mutt_wait_filter (thepid);
}
else { /* handle tagged messages */
mutt_message_hook (Context, Context->hdrs[Context->v2r[i]],
M_MESSAGEHOOK);
mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
- if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
- !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
- security))
- return 1;
}
}
/* add the message separator */
if (sep)
fputs (sep, fpout);
- safe_fclose (&fpout);
+ m_fclose(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
fputs (sep, fpout);
}
}
- safe_fclose (&fpout);
+ m_fclose(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
void mutt_print_message (HEADER * h)
{
- if (quadoption (OPT_PRINT) && (!PrintCmd || !*PrintCmd)) {
+ if (quadoption (OPT_PRINT) && m_strisempty(PrintCmd)) {
mutt_message (_("No printing command has been defined."));
return;
}
buf[0] = 0;
if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
- if (!buf[0] && Shell)
- m_strcpy(buf, sizeof(buf), Shell);
+ if (!buf[0])
+ m_strcpy(buf, sizeof(buf), MCore.shell);
if (buf[0]) {
CLEARLINE (LINES - 1);
mutt_endwin (NULL);
void mutt_enter_command (void)
{
BUFFER err, token;
- char buffer[LONG_STRING], errbuf[SHORT_STRING];
+ char buffer[LONG_STRING], errbuf[STRING];
int r;
buffer[0] = 0;
void mutt_display_address (ENVELOPE * env)
{
const char *pfx = NULL;
- char buf[SHORT_STRING];
+ char buf[STRING];
address_t *adr = NULL;
adr = mutt_get_address(env, &pfx);
*/
buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), adr, 0);
+ rfc822_addrcat(buf, sizeof (buf), adr, 0);
mutt_message ("%s: %s", pfx, buf);
}
int decode, int decrypt, int *redraw) {
int i, need_buffy_cleanup;
int need_passphrase = 0, app = 0;
- char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX];
+ char prompt[STRING], buf[_POSIX_PATH_MAX];
CONTEXT ctx;
struct stat st;
-
-#ifdef BUFFY_SIZE
- BUFFY *tmp = NULL;
-#else
struct utimbuf ut;
-#endif
*redraw = 0;
if (mutt_save_confirm (buf, &st) != 0)
return -1;
- if (need_passphrase && (decode || decrypt)
- && !crypt_valid_passphrase (app))
- return -1;
-
mutt_message (_("Copying to %s..."), buf);
if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
mx_close_mailbox (&ctx, NULL);
if (need_buffy_cleanup) {
-#ifdef BUFFY_SIZE
- tmp = buffy_find_mailbox (buf);
- if (tmp && tmp->new <= 0)
- buffy_update_mailbox (tmp);
-#else
/* fix up the times so buffy won't get confused */
if (st.st_mtime > st.st_atime) {
ut.actime = st.st_atime;
ut.modtime = time (NULL);
utime (buf, &ut);
- }
- else
+ } else {
utime (buf, NULL);
-#endif
+ }
}
mutt_clear_error ();
void mutt_version (void)
{
- mutt_message (mutt_make_version (1));
+ mutt_message (mutt_make_version());
}
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
char buf[LONG_STRING];
char obuf[LONG_STRING];
char tmp[STRING];
- PARAMETER *p;
char charset[STRING];
char *cp;
short charset_changed = 0;
short type_changed = 0;
- cp = mutt_get_parameter ("charset", b->parameter);
+ cp = parameter_getval(b->parameter, "charset");
m_strcpy(charset, sizeof(charset), NONULL(cp));
snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
m_strcpy(obuf, sizeof(obuf), buf);
if (b->parameter) {
- size_t l;
+ parameter_t *p;
+ ssize_t l;
for (p = b->parameter; p; p = p->next) {
l = m_strlen(buf);
return;
/* clean up previous junk */
- parameter_delete(&b->parameter);
+ parameter_list_wipe(&b->parameter);
p_delete(&b->subtype);
mutt_parse_content_type (buf, b);
snprintf (tmp, sizeof (tmp), "%s/%s", TYPE (b), NONULL (b->subtype));
type_changed = ascii_strcasecmp (tmp, obuf);
charset_changed =
- ascii_strcasecmp (charset, mutt_get_parameter ("charset", b->parameter));
+ ascii_strcasecmp (charset, parameter_getval(b->parameter, "charset"));
/* if in send mode, check for conversion - current setting is default. */
int r;
snprintf (tmp, sizeof (tmp), _("Convert to %s upon sending?"),
- mutt_get_parameter ("charset", b->parameter));
+ parameter_getval(b->parameter, "charset"));
if ((r = mutt_yesorno (tmp, !b->noconv)) != -1)
b->noconv = (r == M_NO);
}
if (type_changed)
mutt_sleep (1);
mutt_message (_("Character set changed to %s; %s."),
- mutt_get_parameter ("charset", b->parameter),
+ parameter_getval(b->parameter, "charset"),
b->noconv ? _("not converting") : _("converting"));
}
b->force_charset |= charset_changed ? 1 : 0;
- if (!is_multipart (b) && b->parts)
- mutt_free_body (&b->parts);
- if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
+ if (!is_multipart(b) && b->parts)
+ body_list_wipe(&b->parts);
+ if (!mutt_is_message_type(b) && b->hdr) {
b->hdr->content = NULL;
header_delete(&b->hdr);
}
- if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype)))
+ if (fp && (is_multipart(b) || mutt_is_message_type(b)))
mutt_parse_part (fp, b);
if (h) {