we're grownups now. don't care about stupid OS'es that don't know what an

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index d9a6fb9..48dcabb 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -12,6 +12,8 @@
 #endif
 
 #include "mutt.h"
 #endif
 
 #include "mutt.h"

+#include "ascii.h"
+#include "handler.h"

 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"
 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"


@@ -36,9 +38,8 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
  * below is to avoid creating a HEADER structure in message_handler().
  */
 int
  * below is to avoid creating a HEADER structure in message_handler().
  */
 int

-mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
-               const char *prefix)
-{
+mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
+               int flags, const char *prefix) {

   int from = 0;
   int this_is_from;
   int ignore = 0;
   int from = 0;
   int this_is_from;
   int ignore = 0;


@@ -50,9 +51,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
   int x;
   char *this_one = NULL;
   int error;
   int x;
   char *this_one = NULL;
   int error;

+  int curline = 0;

 
 

-  if (ftell (in) != off_start)
-    fseek (in, off_start, 0);
+  if (ftello (in) != off_start)
+    fseeko (in, off_start, 0);

 
   buf[0] = '\n';
   buf[1] = 0;
 
   buf[0] = '\n';
   buf[1] = 0;


@@ -63,7 +65,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     /* Without these flags to complicate things
      * we can do a more efficient line to line copying
      */
     /* Without these flags to complicate things
      * we can do a more efficient line to line copying
      */

-    while (ftell (in) < off_end) {
+    while (ftello (in) < off_end) {

       nl = strchr (buf, '\n');
 
       if ((fgets (buf, sizeof (buf), in)) == NULL)
       nl = strchr (buf, '\n');
 
       if ((fgets (buf, sizeof (buf), in)) == NULL)


@@ -72,7 +74,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* Is it the begining of a header? */
       if (nl && buf[0] != ' ' && buf[0] != '\t') {
         ignore = 1;
       /* 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;
           if ((flags & CH_FROM) == 0)
             continue;
           from = 1;


@@ -124,10 +126,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
 
   debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
 
 
   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 */
 
   /* Read all the headers into the array */

-  while (ftell (in) < off_end) {
+  while (ftello (in) < off_end) {

     nl = strchr (buf, '\n');
 
     /* Read a line */
     nl = strchr (buf, '\n');
 
     /* Read a line */


@@ -136,6 +138,12 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
 
     /* Is it the begining of a header? */
     if (nl && buf[0] != ' ' && buf[0] != '\t') {
 
     /* 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) {
       /* Do we have anything pending? */
       if (this_one) {
         if (flags & CH_DECODE) {


@@ -146,10 +154,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         if (!headers[x])
           headers[x] = this_one;
         else {
         if (!headers[x])
           headers[x] = this_one;
         else {

-          safe_realloc (&headers[x], mutt_strlen (headers[x]) +
-                        mutt_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__ */
           strcat (headers[x], this_one);        /* __STRCAT_CHECKED__ */

-          FREE (&this_one);
+          mem_free (&this_one);

         }
 
         this_one = NULL;
         }
 
         this_one = NULL;


@@ -157,7 +165,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
 
       ignore = 1;
       this_is_from = 0;
 
       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;
         if ((flags & CH_FROM) == 0)
           continue;
         this_is_from = from = 1;


@@ -198,7 +206,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* 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++) {
       /* 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, mutt_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;
           }
             debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
             break;
           }


@@ -211,15 +219,23 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     if (!ignore) {
       debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
       if (!this_one)
     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,
-                      mutt_strlen (this_one) + mutt_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__ */
                       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) */
+  }                             /* while (ftello (in) < off_end) */

 
   /* Do we have anything pending?  -- XXX, same code as in above in the loop. */
   if (this_one) {
 
   /* Do we have anything pending?  -- XXX, same code as in above in the loop. */
   if (this_one) {


@@ -231,10 +247,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     if (!headers[x])
       headers[x] = this_one;
     else {
     if (!headers[x])
       headers[x] = this_one;
     else {

-      safe_realloc (&headers[x], mutt_strlen (headers[x]) +
-                    mutt_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__ */
       strcat (headers[x], this_one);    /* __STRCAT_CHECKED__ */

-      FREE (&this_one);
+      mem_free (&this_one);

     }
 
     this_one = NULL;
     }
 
     this_one = NULL;


@@ -287,8 +303,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
   /* 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 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);
 
   if (error)
     return (-1);


@@ -335,7 +351,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
   if (flags & CH_TXTPLAIN) {
     char chsbuf[SHORT_STRING];
 
   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),
     fputs ("Content-Transfer-Encoding: 8bit\n", out);
     fputs ("Content-Type: text/plain; charset=", out);
     mutt_canonical_charset (chsbuf, sizeof (chsbuf),


@@ -374,7 +390,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
         /* 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) {
         /* 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;
         }
           t->data = listp->data;
           t->next = refs;
         }


@@ -385,7 +401,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
 
         /* clearing refs from memory */
         for (t = refs; refs; refs = t->next, t = 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 (fputc ('\n', out) == EOF)
           return (-1);


@@ -429,7 +445,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
   }
 
   if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
   }
 
   if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {

-    fprintf (out, "Content-Length: %ld\n", h->content->length);
+    fprintf (out, "Content-Length: %zd\n", h->content->length);

     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }
     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }


@@ -448,7 +464,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
 }
 
 /* Count the number of lines and bytes to be deleted in this body*/
 }
 
 /* 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, off_t *length,

                                size_t datelen)
 {
   int dellines = 0;
                                size_t datelen)
 {
   int dellines = 0;


@@ -456,7 +472,7 @@ static int count_delete_lines (FILE * fp, BODY * b, long *length,
   int ch;
 
   if (b->deleted) {
   int ch;
 
   if (b->deleted) {

-    fseek (fp, b->offset, SEEK_SET);
+    fseeko (fp, b->offset, SEEK_SET);

     for (l = b->length; l; l--) {
       ch = getc (fp);
       if (ch == EOF)
     for (l = b->length; l; l--) {
       ch = getc (fp);
       if (ch == EOF)


@@ -501,7 +517,8 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 {
   char prefix[SHORT_STRING];
   STATE s;
 {
   char prefix[SHORT_STRING];
   STATE s;

-  long new_offset = -1;
+  off_t new_offset = -1;
+  int rc = 0;

 
   if (flags & M_CM_PREFIX) {
     if (option (OPTTEXTFLOWED))
 
   if (flags & M_CM_PREFIX) {
     if (option (OPTTEXTFLOWED))


@@ -517,38 +534,38 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 
     else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
       int new_lines;
 
     else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
       int new_lines;

-      long new_length = body->length;
+      off_t new_length = body->length;

       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));

-      date[5] = date[mutt_strlen (date) - 1] = '\"';
+      date[5] = date[str_len (date) - 1] = '\"';

 
       /* Count the number of lines and bytes to be deleted */
 
       /* Count the number of lines and bytes to be deleted */

-      fseek (fpin, body->offset, SEEK_SET);
+      fseeko (fpin, body->offset, SEEK_SET);

       new_lines = hdr->lines -
       new_lines = hdr->lines -

-        count_delete_lines (fpin, body, &new_length, mutt_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;
 
       /* 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: %zd\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;
       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 */
 
       /* Copy the body */

-      fseek (fpin, body->offset, SEEK_SET);
+      fseeko (fpin, body->offset, SEEK_SET);

       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
 #ifdef DEBUG
       {
       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
 #ifdef DEBUG
       {

-        long fail = ((ftell (fpout) - new_offset) - new_length);
+        off_t fail = ((ftello (fpout) - new_offset) - new_length);

 
         if (fail) {
           mutt_error ("The length calculation was wrong by %ld bytes", fail);
 
         if (fail) {
           mutt_error ("The length calculation was wrong by %ld bytes", fail);


@@ -584,7 +601,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
                           (chflags & CH_PREFIX) ? prefix : NULL) == -1)
       return -1;
 
                           (chflags & CH_PREFIX) ? prefix : NULL) == -1)
       return -1;
 

-    new_offset = ftell (fpout);
+    new_offset = ftello (fpout);

   }
 
   if (flags & M_CM_DECODE) {
   }
 
   if (flags & M_CM_DECODE) {


@@ -608,7 +625,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     if (WithCrypto && flags & M_CM_VERIFY)
       s.flags |= M_VERIFY;
 
     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)) {
   }
   else if (WithCrypto
            && (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {


@@ -620,7 +637,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
         hdr->content->type == TYPEMULTIPART) {
       if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
         return (-1);
         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)
     }
 
     if ((WithCrypto & APPLICATION_SMIME)


@@ -633,7 +650,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 

-    fseek (fp, cur->offset, 0);
+    fseeko (fp, cur->offset, 0);

     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
       mutt_free_body (&cur);
     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
       mutt_free_body (&cur);


@@ -643,7 +660,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     fclose (fp);
   }
   else {
     fclose (fp);
   }
   else {

-    fseek (fpin, body->offset, 0);
+    fseeko (fpin, body->offset, 0);

     if (flags & M_CM_PREFIX) {
       int c;
       size_t bytes = body->length;
     if (flags & M_CM_PREFIX) {
       int c;
       size_t bytes = body->length;


@@ -667,7 +684,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_free_body (&body->parts);
   }
 
     mutt_free_body (&body->parts);
   }
 

-  return 0;
+  return rc;

 }
 
 int
 }
 
 int


@@ -708,7 +725,7 @@ _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
   MESSAGE *msg;
   int r;
 
   MESSAGE *msg;
   int r;
 

-  fseek(fpin, hdr->offset, 0);
+  fseeko(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)
   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)


@@ -755,23 +772,23 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   for (part = b->parts; part; part = part->next) {
     if (part->deleted || part->parts) {
       /* Copy till start of this part */
   for (part = b->parts; part; part = part->next) {
     if (part->deleted || part->parts) {
       /* Copy till start of this part */

-      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin)))
+      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftello (fpin)))

         return -1;
 
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
         return -1;
 
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"

-                 "\texpiration=%s; length=%ld\n"
+                 "\texpiration=%s; length=%zd\n"

                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;
 
         /* Copy the original mime headers */
                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;
 
         /* Copy the original mime headers */

-        if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin)))
+        if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin)))

           return -1;
 
         /* Skip the deleted body */
           return -1;
 
         /* Skip the deleted body */

-        fseek (fpin, part->offset + part->length, SEEK_SET);
+        fseeko (fpin, part->offset + part->length, SEEK_SET);

       }
       else {
         if (copy_delete_attach (part, fpin, fpout, date))
       }
       else {
         if (copy_delete_attach (part, fpin, fpout, date))


@@ -781,7 +798,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   }
 
   /* Copy the last parts */
   }
 
   /* Copy the last parts */

-  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin)))
+  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftello (fpin)))

     return -1;
 
   return 0;
     return -1;
 
   return 0;


@@ -804,11 +821,11 @@ static void format_address_header (char **h, ADDRESS * a)
 
   int l, linelen, buflen, count;
 
 
   int l, linelen, buflen, count;
 

-  linelen = mutt_strlen (*h);
+  linelen = str_len (*h);

   buflen = linelen + 3;
 
 
   buflen = linelen + 3;
 
 

-  safe_realloc (h, buflen);
+  mem_realloc (h, buflen);

   for (count = 0; a; a = a->next, count++) {
     ADDRESS *tmp = a->next;
 
   for (count = 0; a; a = a->next, count++) {
     ADDRESS *tmp = a->next;
 


@@ -817,7 +834,7 @@ static void format_address_header (char **h, ADDRESS * a)
     rfc822_write_address (buf, sizeof (buf), a, 0);
     a->next = tmp;
 
     rfc822_write_address (buf, sizeof (buf), a, 0);
     a->next = tmp;
 

-    l = mutt_strlen (buf);
+    l = str_len (buf);

     if (count && linelen + l > 74) {
       strcpy (cbuf, "\n\t");    /* __STRCPY_CHECKED__ */
       linelen = l + 8;
     if (count && linelen + l > 74) {
       strcpy (cbuf, "\n\t");    /* __STRCPY_CHECKED__ */
       linelen = l + 8;


@@ -835,8 +852,8 @@ static void format_address_header (char **h, ADDRESS * a)
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 

-    buflen += l + mutt_strlen (cbuf) + mutt_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__ */
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */
     strcat (*h, c2buf);         /* __STRCAT_CHECKED__ */


@@ -919,7 +936,7 @@ static int address_header_decode (char **h)
   mutt_addrlist_to_local (a);
   rfc2047_decode_adrlist (a);
 
   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);
 
 
   strfcpy (*h, s, l + 1);
 


@@ -927,6 +944,6 @@ static int address_header_decode (char **h)
 
   rfc822_free_address (&a);
 
 
   rfc822_free_address (&a);
 

-  FREE (&s);
+  mem_free (&s);

   return 1;
 }
   return 1;
 }