#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
int x;
char *this_one = NULL;
int error;
+ int curline = 0;
if (ftell (in) != off_start)
fseek (in, off_start, 0);
/* Is it the begining of a header? */
if (nl && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
- if (!from && safe_strncmp ("From ", buf, 5) == 0) {
+ if (!from && str_ncmp ("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
from = 1;
debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
- headers = safe_calloc (hdr_count, sizeof (char *));
+ headers = mem_calloc (hdr_count, sizeof (char *));
/* Read all the headers into the array */
while (ftell (in) < off_end) {
/* Is it the begining of a header? */
if (nl && 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);
+
/* Do we have anything pending? */
if (this_one) {
if (flags & CH_DECODE) {
if (!headers[x])
headers[x] = this_one;
else {
- safe_realloc (&headers[x], safe_strlen (headers[x]) +
- safe_strlen (this_one) + sizeof (char));
+ mem_realloc (&headers[x], str_len (headers[x]) +
+ str_len (this_one) + sizeof (char));
strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- FREE (&this_one);
+ mem_free (&this_one);
}
this_one = NULL;
ignore = 1;
this_is_from = 0;
- if (!from && safe_strncmp ("From ", buf, 5) == 0) {
+ if (!from && str_ncmp ("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
this_is_from = from = 1;
/* Find x -- the array entry where this header is to be saved */
if (flags & CH_REORDER) {
for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
- if (!ascii_strncasecmp (buf, t->data, safe_strlen (t->data))) {
+ if (!ascii_strncasecmp (buf, t->data, str_len (t->data))) {
debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
break;
}
if (!ignore) {
debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
if (!this_one)
- this_one = safe_strdup (buf);
- else {
- safe_realloc (&this_one,
- safe_strlen (this_one) + safe_strlen (buf) +
+ this_one = str_dup (buf);
+ /* we do want to see all lines if this header doesn't feature
+ * abbreviations (curline is 0), $max_display_recips is 0 and
+ * while the number hasn't reached $max_display_recips yet */
+ else if (curline == 0 || MaxDispRecips == 0 || ++curline <= MaxDispRecips) {
+ mem_realloc (&this_one,
+ str_len (this_one) + str_len (buf) +
sizeof (char));
strcat (this_one, buf); /* __STRCAT_CHECKED__ */
+ /* only for the first line which doesn't exeeds
+ * $max_display_recips: abbreviate it */
+ } else if (curline == MaxDispRecips+1) {
+ mem_realloc (&this_one, str_len (this_one) + 5);
+ strcat (this_one, " ...");
}
}
} /* while (ftell (in) < off_end) */
if (!headers[x])
headers[x] = this_one;
else {
- safe_realloc (&headers[x], safe_strlen (headers[x]) +
- safe_strlen (this_one) + sizeof (char));
+ mem_realloc (&headers[x], str_len (headers[x]) +
+ str_len (this_one) + sizeof (char));
strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- FREE (&this_one);
+ mem_free (&this_one);
}
this_one = NULL;
/* Free in a separate loop to be sure that all headers are freed
* in case of error. */
for (x = 0; x < hdr_count; x++)
- FREE (&headers[x]);
- FREE (&headers);
+ mem_free (&headers[x]);
+ mem_free (&headers);
if (error)
return (-1);
{
char buffer[SHORT_STRING];
- flags |= (h->irt_changed ? CH_UPDATE_IRT : 0)
- | (h->refs_changed ? CH_UPDATE_REFS : 0);
+ if (h->env)
+ flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
+ (h->env->refs_changed ? CH_UPDATE_REFS : 0);
if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) ==
-1)
if (flags & CH_TXTPLAIN) {
char chsbuf[SHORT_STRING];
- fputs ("Mime-Version: 1.0\n", out);
+ 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),
if (flags & CH_UPDATE) {
if ((flags & CH_NOSTATUS) == 0) {
- if (h->irt_changed && h->new_env->in_reply_to) {
- LIST *listp = h->new_env->in_reply_to;
+ if (h->env->irt_changed && h->env->in_reply_to) {
+ LIST *listp = h->env->in_reply_to;
if (fputs ("In-Reply-To: ", out) == EOF)
return (-1);
return (-1);
}
- if (h->refs_changed && h->new_env->references) {
- LIST *listp = h->new_env->references, *refs = NULL, *t;
+ if (h->env->refs_changed && h->env->references) {
+ LIST *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 = (LIST *) safe_malloc (sizeof (LIST));
+ t = (LIST *) mem_malloc (sizeof (LIST));
t->data = listp->data;
t->next = refs;
}
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
- FREE (&refs);
+ mem_free (&refs);
if (fputc ('\n', out) == EOF)
return (-1);
}
if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
- fprintf (out, "Content-Length: %ld\n", h->content->length);
+ fprintf (out, "Content-Length: " OFF_T_FMT "\n", h->content->length);
if (h->lines != 0 || h->content->length == 0)
fprintf (out, "Lines: %d\n", h->lines);
}
}
/* Count the number of lines and bytes to be deleted in this body*/
-static int count_delete_lines (FILE * fp, BODY * b, long *length,
+static int count_delete_lines (FILE * fp, BODY * b, LOFF_T *length,
size_t datelen)
{
int dellines = 0;
{
char prefix[SHORT_STRING];
STATE s;
- long new_offset = -1;
+ LOFF_T new_offset = -1;
+ int rc = 0;
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
- long new_length = body->length;
+ LOFF_T new_length = body->length;
char date[SHORT_STRING];
mutt_make_date (date, sizeof (date));
- date[5] = date[safe_strlen (date) - 1] = '\"';
+ date[5] = date[str_len (date) - 1] = '\"';
/* Count the number of lines and bytes to be deleted */
fseek (fpin, body->offset, SEEK_SET);
new_lines = hdr->lines -
- count_delete_lines (fpin, body, &new_length, safe_strlen (date));
+ count_delete_lines (fpin, body, &new_length, str_len (date));
/* Copy the headers */
if (mutt_copy_header (fpin, hdr, fpout,
chflags | CH_NOLEN | CH_NONEWLINE, NULL))
return -1;
- fprintf (fpout, "Content-Length: %ld\n", new_length);
+ fprintf (fpout, "Content-Length: " OFF_T_FMT "\n", new_length);
if (new_lines <= 0)
new_lines = 0;
else
fprintf (fpout, "Lines: %d\n\n", new_lines);
if (ferror (fpout) || feof (fpout))
return -1;
- new_offset = ftell (fpout);
+ new_offset = ftello (fpout);
/* Copy the body */
fseek (fpin, body->offset, SEEK_SET);
#ifdef DEBUG
{
- long fail = ((ftell (fpout) - new_offset) - new_length);
+ LOFF_T fail = ((ftello (fpout) - new_offset) - new_length);
if (fail) {
mutt_error ("The length calculation was wrong by %ld bytes", fail);
(chflags & CH_PREFIX) ? prefix : NULL) == -1)
return -1;
- new_offset = ftell (fpout);
+ new_offset = ftello (fpout);
}
if (flags & M_CM_DECODE) {
if (WithCrypto && flags & M_CM_VERIFY)
s.flags |= M_VERIFY;
- mutt_body_handler (body, &s);
+ rc = mutt_body_handler (body, &s);
}
else if (WithCrypto
&& (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
hdr->content->type == TYPEMULTIPART) {
if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
return (-1);
- fputs ("Mime-Version: 1.0\n", fpout);
+ fputs ("MIME-Version: 1.0\n", fpout);
}
if ((WithCrypto & APPLICATION_SMIME)
mutt_free_body (&body->parts);
}
- return 0;
+ return rc;
}
int
int
_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
- HEADER * hdr, BODY * body, int flags, int chflags)
-{
+ HEADER * hdr, BODY * body, int flags, int chflags) {
+ char buf[STRING];
MESSAGE *msg;
int r;
- if ((msg =
- mx_open_new_message (dest, hdr,
- (src->magic == M_MBOX
- || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) ==
- NULL)
- return -1;
+ fseek(fpin, hdr->offset, 0);
+ if (fgets (buf, sizeof (buf), fpin) == NULL)
+ 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)
chflags |= CH_FROM | CH_FORCE_FROM;
chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
if (part->deleted) {
fprintf (fpout,
"Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
- "\texpiration=%s; length=%ld\n"
+ "\texpiration=%s; length=" OFF_T_FMT "\n"
"\n", date + 5, part->length);
if (ferror (fpout))
return -1;
int l, linelen, buflen, count;
- linelen = safe_strlen (*h);
+ linelen = str_len (*h);
buflen = linelen + 3;
- safe_realloc (h, buflen);
+ mem_realloc (h, buflen);
for (count = 0; a; a = a->next, count++) {
ADDRESS *tmp = a->next;
rfc822_write_address (buf, sizeof (buf), a, 0);
a->next = tmp;
- l = safe_strlen (buf);
+ l = str_len (buf);
if (count && linelen + l > 74) {
strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
linelen = l + 8;
strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
}
- buflen += l + safe_strlen (cbuf) + safe_strlen (c2buf);
- safe_realloc (h, buflen);
+ buflen += l + str_len (cbuf) + str_len (c2buf);
+ mem_realloc (h, buflen);
strcat (*h, cbuf); /* __STRCAT_CHECKED__ */
strcat (*h, buf); /* __STRCAT_CHECKED__ */
strcat (*h, c2buf); /* __STRCAT_CHECKED__ */
mutt_addrlist_to_local (a);
rfc2047_decode_adrlist (a);
- *h = safe_calloc (1, l + 2);
+ *h = mem_calloc (1, l + 2);
strfcpy (*h, s, l + 1);
rfc822_free_address (&a);
- FREE (&s);
+ mem_free (&s);
return 1;
}