X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=46dfd647c60d42b6d50268acb07a9ad66ac1d8b5;hp=504a1e2f555fde0c5b2aa466456cf470a9acb19f;hb=5b0581b41f115cd0442037a97db313ef5b5b8822;hpb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc

diff --git a/copy.c b/copy.c
index 504a1e2..46dfd64 100644
--- a/copy.c
+++ b/copy.c
@@ -11,11 +11,17 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+
 #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-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -23,16 +29,9 @@
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>             /* needed for SEEK_SET under SunOS 4.1.4 */
-
 static int address_header_decode (char **str);
 static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
                                char *date);
@@ -48,7 +47,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
   int ignore = 0;
   char buf[STRING];             /* should be long enough to get most fields in one pass */
   char *nl;
-  LIST *t;
+  string_list_t *t;
   char **headers;
   int hdr_count;
   int x;
@@ -367,7 +366,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
   if (flags & CH_UPDATE) {
     if ((flags & CH_NOSTATUS) == 0) {
       if (h->env->irt_changed && h->env->in_reply_to) {
-        LIST *listp = h->env->in_reply_to;
+        string_list_t *listp = h->env->in_reply_to;
 
         if (fputs ("In-Reply-To: ", out) == EOF)
           return (-1);
@@ -381,7 +380,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
       }
 
       if (h->env->refs_changed && h->env->references) {
-        LIST *listp = h->env->references, *refs = NULL, *t;
+        string_list_t *listp = h->env->references, *refs = NULL, *t;
 
         if (fputs ("References: ", out) == EOF)
           return (-1);
@@ -389,7 +388,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 = p_new(LIST, 1);
+          t = p_new(string_list_t, 1);
           t->data = listp->data;
           t->next = refs;
         }
@@ -621,26 +620,23 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     if (flags & M_CM_REPLYING)
       s.flags |= M_REPLYING;
 
-    if (WithCrypto && flags & M_CM_VERIFY)
+    if (flags & M_CM_VERIFY)
       s.flags |= M_VERIFY;
 
     rc = mutt_body_handler (body, &s);
   }
-  else if (WithCrypto
-           && (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
+  else if ((flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
     BODY *cur;
     FILE *fp;
 
-    if ((WithCrypto & APPLICATION_PGP)
-        && (flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
+    if ((flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
         hdr->content->type == TYPEMULTIPART) {
       if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
         return (-1);
       fputs ("MIME-Version: 1.0\n", fpout);
     }
 
-    if ((WithCrypto & APPLICATION_SMIME)
-        && (flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
+    if ((flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
         && hdr->content->type == TYPEAPPLICATION) {
       if (crypt_smime_decrypt_mime (fpin, &fp, hdr->content, &cur))
         return (-1);
@@ -939,7 +935,7 @@ static int address_header_decode (char **h)
 
   format_address_header (h, a);
 
-  address_delete (&a);
+  address_list_wipe(&a);
 
   p_delete(&s);
   return 1;