# 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-mime/mime.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
-#include "mime.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
/* Is it the begining of a header? */
if (nl && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
- if (!from && str_ncmp ("From ", buf, 5) == 0) {
+ if (!from && m_strncmp("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 = 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__ */
+ p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
+ strcat(headers[x], this_one); /* __STRCAT_CHECKED__ */
p_delete(&this_one);
}
ignore = 1;
this_is_from = 0;
- if (!from && str_ncmp ("From ", buf, 5) == 0) {
+ if (!from && m_strncmp("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, 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__ */
p_delete(&this_one);
}
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 & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
- strfcpy (prefix, ">", sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), ">");
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
hdr, 0);
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,
if (flags & M_CM_DECODE) {
/* now make a text/plain version of the message */
- memset (&s, 0, sizeof (STATE));
+ p_clear(&s, 1);
s.fpin = fpin;
s.fpout = fpout;
if (flags & M_CM_PREFIX)
* XXX - fix that.
*/
-static void format_address_header (char **h, ADDRESS * a)
+static void format_address_header (char **h, address_t * a)
{
char buf[HUGE_STRING];
char cbuf[STRING];
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;
+ address_t *tmp = a->next;
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
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__ */
char *s = *h;
int l;
- ADDRESS *a = NULL;
+ address_t *a = NULL;
switch (tolower ((unsigned char) *s)) {
case 'r':
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);
+ address_delete (&a);
p_delete(&s);
return 1;
projects / apps / madmutt.git / blobdiff