#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 "sort.h"
#include "copy.h"
#include "pager.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include "mutt_idna.h"
#include <sys/types.h>
#include <sys/stat.h>
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
- fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_error _("Could not create temporary file!");
return 0;
/* 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,
mutt_wait_filter (filterpid);
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)
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;
}
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), "...?");
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;
}
}
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;
struct utimbuf ut;
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) {
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)
if (!is_multipart(b) && b->parts)
body_list_wipe(&b->parts);
- if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
+ 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) {