*/
#include <lib-lib/lib-lib.h>
-#include <utime.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <nntp/nntp.h>
#endif
-#ifdef MIXMASTER
#include "remailer.h"
-#endif
-
static void append_signature (FILE * f)
{
if (curenv->real_subj) {
p_delete(&env->subject);
env->subject = p_new(char, m_strlen(curenv->real_subj) + 5);
- sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
+ sprintf (env->subject, "Re: %s", curenv->real_subj);
}
else if (!env->subject)
env->subject = m_strdup("Re: your mail");
else if (option (OPTUSEDOMAIN)) {
adr = address_new ();
adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
- sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
+ sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));
}
else {
adr = address_new ();
if (!tempfp)
return -1;
-#ifdef MIXMASTER
mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
msg->chain ? 1 : 0);
-#endif
-#ifndef MIXMASTER
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-#endif
-
fputc ('\n', tempfp); /* tie off the header. */
if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
}
if (m_fclose(&tempfp) != 0) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
unlink (tempfile);
return (-1);
}
-#ifdef MIXMASTER
if (msg->chain)
return mix_send_message (msg->chain, tempfile);
-#endif
i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
msg->env->bcc, tempfile,
{
HEADER *msg = header_new();
- if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
+ if (mutt_prepare_template (fp, ctx, msg, cur, option(OPTWEED)) < 0)
return -1;
return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
if (!(flags & SENDBATCH)) {
struct stat st;
- time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
+ time_t mtime = m_decrease_mtime(msg->content->filename, NULL);
mutt_update_encoding (msg->content);