X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=05a73713417f564b758d4f6418c1979207b6597f;hp=2b86aadf96a09788de1e9f9506265e1fcdab8f39;hb=7a368b3670a90656b2e0e724ed3efd79221f3d31;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/copy.c b/copy.c
index 2b86aad..05a7371 100644
--- a/copy.c
+++ b/copy.c
@@ -17,12 +17,13 @@
 #include <lib-lib/file.h>
 #include <lib-lib/ascii.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"
-#include "mime.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
@@ -355,7 +356,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
     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);
 
@@ -521,7 +522,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 
   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);
@@ -812,7 +813,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
  * 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];
@@ -826,7 +827,7 @@ static void format_address_header (char **h, ADDRESS * a)
 
   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';
@@ -867,7 +868,7 @@ static int address_header_decode (char **h)
   char *s = *h;
   int l;
 
-  ADDRESS *a = NULL;
+  address_t *a = NULL;
 
   switch (tolower ((unsigned char) *s)) {
   case 'r':
@@ -939,7 +940,7 @@ static int address_header_decode (char **h)
 
   format_address_header (h, a);
 
-  rfc822_free_address (&a);
+  address_delete (&a);
 
   p_delete(&s);
   return 1;