#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
-
#include "mutt.h"
#include "handler.h"
+#include "crypt.h"
#include "recvattach.h"
#include "copy.h"
#include "pager.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "mutt_libesmtp.h"
+#include "send_smtp.h"
#ifdef USE_NNTP
#include <nntp/nntp.h>
int ncodes, const char **tocodes,
int *tocode, CONTENT * info)
{
-#ifdef HAVE_ICONV
iconv_t cd1, *cd;
char bufi[256], bufu[512], bufo[4 * sizeof (bufi)];
const char *ib, *ub;
p_delete(&states);
return ret;
-#else
- return -1;
-#endif /* !HAVE_ICONV */
}
/*
if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
(hdr->security & ENCRYPT)) {
- if (!crypt_valid_passphrase (hdr->security))
- return (NULL);
}
fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
return m_strdup(buf);
}
-static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
+static void alarm_handler (int sig __attribute__ ((unused)))
{
SigAlrm = 1;
}
struct stat st;
if (!stat(childout, &st) && st.st_size > 0)
- mutt_do_pager(_("Output of the delivery process"), childout, 0,
- NULL);
+ mutt_pager(_("Output of the delivery process"), childout, 0, NULL);
}
}
} else {
if (!option (OPTNEWSSEND))
#endif
if (SmtpHost)
- return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
+ return send_smtp_invoke (from, to, cc, bcc, msg, eightbit);
#endif
return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
/* We need to add a Content-Length field to avoid problems where a line in
* the message body begins with "From "
*/
- if (f.magic == M_MMDF || f.magic == M_MBOX) {
+ if (f.magic == M_MBOX) {
tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));