X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=399a65bd19dc299e81c6b72fcc740d2a5ac85a12;hp=d0af92dc2bd1edb2e6bf0a1845d482314e71d8ef;hb=d0dc8fb657cff90709c15d4b106415b868857f6a;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/copy.c b/copy.c
index d0af92d..399a65b 100644
--- a/copy.c
+++ b/copy.c
@@ -23,7 +23,6 @@
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
-#include "rfc2047.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
@@ -356,7 +355,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);
 
@@ -813,7 +812,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];
@@ -827,7 +826,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';
@@ -868,7 +867,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':
@@ -940,7 +939,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;