# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
- headers = mem_calloc (hdr_count, sizeof (char *));
+ headers = p_new(char *, hdr_count);
/* Read all the headers into the array */
while (ftello (in) < off_end) {
if (!headers[x])
headers[x] = this_one;
else {
- mem_realloc (&headers[x], str_len (headers[x]) +
- str_len (this_one) + sizeof (char));
- strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- mem_free (&this_one);
+ p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
+ strcat(headers[x], this_one); /* __STRCAT_CHECKED__ */
+ p_delete(&this_one);
}
this_one = NULL;
/* 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, str_len (t->data))) {
+ if (!ascii_strncasecmp (buf, t->data, m_strlen(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 = str_dup (buf);
+ this_one = m_strdup(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));
+ p_realloc(&this_one, m_strlen(this_one) + m_strlen(buf) + 1);
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);
+ p_realloc(&this_one, m_strlen(this_one) + 5);
strcat (this_one, " ...");
}
}
if (!headers[x])
headers[x] = this_one;
else {
- mem_realloc (&headers[x], str_len (headers[x]) +
- str_len (this_one) + sizeof (char));
+ p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- mem_free (&this_one);
+ p_delete(&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++)
- mem_free (&headers[x]);
- mem_free (&headers);
+ p_delete(&headers[x]);
+ p_delete(&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 *) mem_malloc (sizeof (LIST));
+ t = p_new(LIST, 1);
t->data = listp->data;
t->next = refs;
}
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
- mem_free (&refs);
+ p_delete(&refs);
if (fputc ('\n', out) == EOF)
return (-1);
char date[SHORT_STRING];
mutt_make_date (date, sizeof (date));
- date[5] = date[str_len (date) - 1] = '\"';
+ date[5] = date[m_strlen(date) - 1] = '\"';
/* Count the number of lines and bytes to be deleted */
fseeko (fpin, body->offset, SEEK_SET);
new_lines = hdr->lines -
- count_delete_lines (fpin, body, &new_length, str_len (date));
+ count_delete_lines (fpin, body, &new_length, m_strlen(date));
/* Copy the headers */
if (mutt_copy_header (fpin, hdr, fpout,
int l, linelen, buflen, count;
- linelen = str_len (*h);
+ linelen = m_strlen(*h);
buflen = linelen + 3;
- mem_realloc (h, buflen);
+ p_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 = str_len (buf);
+ l = m_strlen(buf);
if (count && linelen + l > 74) {
strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
linelen = l + 8;
strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
}
- buflen += l + str_len (cbuf) + str_len (c2buf);
- mem_realloc (h, buflen);
+ buflen += l + m_strlen(cbuf) + m_strlen(c2buf);
+ p_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 = mem_calloc (1, l + 2);
-
- strfcpy (*h, s, l + 1);
+ *h = p_dupstr(s, l + 1);
format_address_header (h, a);
rfc822_free_address (&a);
- mem_free (&s);
+ p_delete(&s);
return 1;
}