X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=b7ca57e7453994efba9188e2c9c1c5309410bd2a;hp=cbca6700211614b894c093fde8f40b18c407be09;hb=ba4333b5854d2caf6b486372b060376990fe089e;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/copy.c b/copy.c
index cbca670..b7ca57e 100644
--- a/copy.c
+++ b/copy.c
@@ -12,6 +12,8 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"
@@ -124,7 +126,7 @@ 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"));
 
-  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) {
@@ -146,10 +148,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         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;
@@ -213,7 +215,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       if (!this_one)
         this_one = str_dup (buf);
       else {
-        safe_realloc (&this_one,
+        mem_realloc (&this_one,
                       str_len (this_one) + str_len (buf) +
                       sizeof (char));
         strcat (this_one, buf); /* __STRCAT_CHECKED__ */
@@ -231,10 +233,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     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;
@@ -287,8 +289,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 (&headers[x]);
-  FREE (&headers);
+    mem_free (&headers[x]);
+  mem_free (&headers);
 
   if (error)
     return (-1);
@@ -374,7 +376,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) {
-          t = (LIST *) safe_malloc (sizeof (LIST));
+          t = (LIST *) mem_malloc (sizeof (LIST));
           t->data = listp->data;
           t->next = refs;
         }
@@ -385,7 +387,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)
-          FREE (&refs);
+          mem_free (&refs);
 
         if (fputc ('\n', out) == EOF)
           return (-1);
@@ -502,6 +504,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
   char prefix[SHORT_STRING];
   STATE s;
   long new_offset = -1;
+  int rc = 0;
 
   if (flags & M_CM_PREFIX) {
     if (option (OPTTEXTFLOWED))
@@ -608,7 +611,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     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)) {
@@ -667,7 +670,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_free_body (&body->parts);
   }
 
-  return 0;
+  return rc;
 }
 
 int
@@ -808,7 +811,7 @@ static void format_address_header (char **h, ADDRESS * a)
   buflen = linelen + 3;
 
 
-  safe_realloc (h, buflen);
+  mem_realloc (h, buflen);
   for (count = 0; a; a = a->next, count++) {
     ADDRESS *tmp = a->next;
 
@@ -836,7 +839,7 @@ static void format_address_header (char **h, ADDRESS * a)
     }
 
     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__ */
@@ -919,7 +922,7 @@ static int address_header_decode (char **h)
   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);
 
@@ -927,6 +930,6 @@ static int address_header_decode (char **h)
 
   rfc822_free_address (&a);
 
-  FREE (&s);
+  mem_free (&s);
   return 1;
 }