#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include "handler.h"
#include "copy.h"
-#include <lib-crypt/crypt.h>
-#include <lib-ui/curses.h>
+#include "crypt.h"
#include "mutt_idna.h"
static int address_header_decode (char **str);
fputs ("MIME-Version: 1.0\n", out);
fputs ("Content-Transfer-Encoding: 8bit\n", out);
fputs ("Content-Type: text/plain; charset=", out);
- charset_canonicalize(chsbuf, sizeof (chsbuf), Charset);
+ charset_canonicalize(chsbuf, sizeof (chsbuf), mod_cset.charset);
rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
fputs (buffer, out);
fputc ('\n', out);
}
if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
- fprintf (out, "Content-Length: %lld\n", h->content->length);
+ fprintf (out, "Content-Length: %zu\n", h->content->length);
if (h->lines != 0 || h->content->length == 0)
fprintf (out, "Lines: %d\n", h->lines);
}
if (mutt_copy_header (fpin, hdr, fpout,
chflags | CH_NOLEN | CH_NONEWLINE, NULL))
return -1;
- fprintf (fpout, "Content-Length: %lld\n", new_length);
+ fprintf (fpout, "Content-Length: %zu\n", new_length);
if (new_lines <= 0)
new_lines = 0;
else
return (-1);
if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
return (-1);
- if (dest->magic == M_MBOX || dest->magic == M_MMDF)
+ if (dest->magic == M_MBOX)
chflags |= CH_FROM | CH_FORCE_FROM;
chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
r = _mutt_copy_message (msg->fp, fpin, hdr, body, flags, chflags);
if (part->deleted) {
fprintf (fpout,
"Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
- "\texpiration=%s; length=%lld\n"
+ "\texpiration=%s; length=%zu\n"
"\n", date + 5, part->length);
if (ferror (fpout))
return -1;