#include "handler.h"
#include "mx.h"
#include "copy.h"
-#include "rfc2047.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
fputs ("Content-Type: text/plain; charset=", out);
mutt_canonical_charset (chsbuf, sizeof (chsbuf),
Charset ? Charset : "us-ascii");
- rfc822_cat (buffer, sizeof (buffer), chsbuf, MimeSpecials);
+ 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: %zd\n", h->content->length);
+ fprintf (out, "Content-Length: %lld\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: %zd\n", new_length);
+ fprintf (fpout, "Content-Length: %lld\n", new_length);
if (new_lines <= 0)
new_lines = 0;
else
*/
int
-_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
+_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ((unused)),
HEADER * hdr, BODY * body, int flags, int chflags) {
char buf[STRING];
MESSAGE *msg;
if (part->deleted) {
fprintf (fpout,
"Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
- "\texpiration=%s; length=%zd\n"
+ "\texpiration=%s; length=%lld\n"
"\n", date + 5, part->length);
if (ferror (fpout))
return -1;
format_address_header (h, a);
- rfc822_free_address (&a);
+ address_delete (&a);
p_delete(&s);
return 1;