#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);
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], str_len (headers[x]) +
+ 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;
debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
if (!this_one)
this_one = str_dup (buf);
- else {
- safe_realloc (&this_one,
+ /* 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], str_len (headers[x]) +
+ 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);
/* 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);
char prefix[SHORT_STRING];
STATE s;
long new_offset = -1;
+ int rc = 0;
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
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)) {
mutt_free_body (&body->parts);
}
- return 0;
+ return rc;
}
int
buflen = linelen + 3;
- safe_realloc (h, buflen);
+ mem_realloc (h, buflen);
for (count = 0; a; a = a->next, count++) {
ADDRESS *tmp = a->next;
}
buflen += l + str_len (cbuf) + str_len (c2buf);
- safe_realloc (h, buflen);
+ 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;
}