* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include "handler.h"
#include "mx.h"
#include "copy.h"
-#include "rfc2047.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
+#include <lib-ui/curses.h>
#include "mutt_idna.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h> /* needed for SEEK_SET under SunOS 4.1.4 */
-
static int address_header_decode (char **str);
static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
char *date);
int this_is_from;
int ignore = 0;
char buf[STRING]; /* should be long enough to get most fields in one pass */
- char *nl;
- LIST *t;
+ char *eol;
+ string_list_t *t;
char **headers;
int hdr_count;
int x;
* we can do a more efficient line to line copying
*/
while (ftello (in) < off_end) {
- nl = strchr (buf, '\n');
+ eol = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (nl && buf[0] != ' ' && buf[0] != '\t') {
+ if (eol && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
*/
if (flags & CH_REORDER) {
for (t = HeaderOrderList; t; t = t->next) {
- debug_print (1, ("Reorder list: %s\n", t->data));
hdr_count++;
}
}
- debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
-
headers = p_new(char *, hdr_count);
/* Read all the headers into the array */
while (ftello (in) < off_end) {
- nl = strchr (buf, '\n');
+ eol = strchr (buf, '\n');
/* Read a line */
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (nl && buf[0] != ' ' && buf[0] != '\t') {
+ if (eol && buf[0] != ' ' && buf[0] != '\t') {
/* set curline to 1 for To:/Cc:/Bcc: and 0 otherwise */
- curline = (flags & CH_WEED) && (ascii_strncmp ("To:", buf, 3) == 0 ||
- ascii_strncmp ("Cc:", buf, 3) == 0 ||
- ascii_strncmp ("Bcc:", buf, 4) == 0);
+ curline = (flags & CH_WEED) && (m_strncmp("To:", buf, 3) == 0 ||
+ m_strncmp("Cc:", buf, 3) == 0 ||
+ m_strncmp("Bcc:", buf, 4) == 0);
/* Do we have anything pending? */
if (this_one) {
if (flags & CH_REORDER) {
for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) {
- debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
break;
}
}
} /* If beginning of header */
if (!ignore) {
- debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
if (!this_one)
this_one = m_strdup(buf);
/* we do want to see all lines if this header doesn't feature
fputs ("MIME-Version: 1.0\n", out);
fputs ("Content-Transfer-Encoding: 8bit\n", out);
fputs ("Content-Type: text/plain; charset=", out);
- mutt_canonical_charset (chsbuf, sizeof (chsbuf),
- Charset ? Charset : "us-ascii");
+ charset_canonicalize(chsbuf, sizeof (chsbuf), Charset);
rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
fputs (buffer, out);
fputc ('\n', out);
if (flags & CH_UPDATE) {
if ((flags & CH_NOSTATUS) == 0) {
if (h->env->irt_changed && h->env->in_reply_to) {
- LIST *listp = h->env->in_reply_to;
+ string_list_t *listp = h->env->in_reply_to;
if (fputs ("In-Reply-To: ", out) == EOF)
return (-1);
}
if (h->env->refs_changed && h->env->references) {
- LIST *listp = h->env->references, *refs = NULL, *t;
+ string_list_t *listp = h->env->references, *refs = NULL, *t;
if (fputs ("References: ", out) == EOF)
return (-1);
/* Mutt stores references in reverse order, thus we create
* a reordered refs list that we can put in the headers */
for (; listp; listp = listp->next, refs = t) {
- t = p_new(LIST, 1);
+ t = p_new(string_list_t, 1);
t->data = listp->data;
t->next = refs;
}
}
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
if (copy_delete_attach (body, fpin, fpout, date))
return -1;
-#ifdef DEBUG
- {
- off_t fail = ((ftello (fpout) - new_offset) - new_length);
-
- if (fail) {
- mutt_error ("The length calculation was wrong by %ld bytes", fail);
- new_length += fail;
- mutt_sleep (1);
- }
- }
-#endif
-
/* Update original message if we are sync'ing a mailfolder */
if (flags & M_CM_UPDATE) {
hdr->attach_del = 0;
Context->vsize -= body->length - new_length;
body->length = new_length;
- mutt_free_body (&body->parts);
+ body_list_wipe(&body->parts);
}
return 0;
if (flags & M_CM_REPLYING)
s.flags |= M_REPLYING;
- if (WithCrypto && flags & M_CM_VERIFY)
+ if (flags & M_CM_VERIFY)
s.flags |= M_VERIFY;
rc = mutt_body_handler (body, &s);
}
- else if (WithCrypto
- && (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
+ else if ((flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
BODY *cur;
FILE *fp;
- if ((WithCrypto & APPLICATION_PGP)
- && (flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
+ if ((flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
hdr->content->type == TYPEMULTIPART) {
if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
return (-1);
fputs ("MIME-Version: 1.0\n", fpout);
}
- if ((WithCrypto & APPLICATION_SMIME)
- && (flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
+ if ((flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
&& hdr->content->type == TYPEAPPLICATION) {
if (crypt_smime_decrypt_mime (fpin, &fp, hdr->content, &cur))
return (-1);
fseeko (fp, cur->offset, 0);
if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
fclose (fp);
- mutt_free_body (&cur);
+ body_list_wipe(&cur);
return (-1);
}
- mutt_free_body (&cur);
+ body_list_wipe(&cur);
fclose (fp);
}
else {
if ((flags & M_CM_UPDATE) && (flags & M_CM_NOHEADER) == 0
&& new_offset != -1) {
body->offset = new_offset;
- mutt_free_body (&body->parts);
+ body_list_wipe(&body->parts);
}
return rc;
_mutt_copy_message (fpout, msg->fp, hdr, hdr->content, flags,
chflags)) == 0 && (ferror (fpout)
|| feof (fpout))) {
- debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
r = -1;
}
mx_close_message (&msg);
*/
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);
- address_delete (&a);
+ address_list_wipe(&a);
p_delete(&s);
return 1;