X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=e352c4a0ec50e963c8dafc24306046e3e380a9d5;hp=3323af6570ab35c9a98f94088c881035af65dd33;hb=d4321859bb9ce5b43fbd8303394cf98ae7720a38;hpb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc

diff --git a/attach.c b/attach.c
index 3323af6..e352c4a 100644
--- a/attach.c
+++ b/attach.c
@@ -12,36 +12,38 @@
 # include "config.h"
 #endif
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/unix.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "rfc1524.h"
 #include "pager.h"
 #include "copy.h"
 #include "mx.h"
-#include "mutt_crypt.h"
-
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <lib-crypt/crypt.h>
 
 int mutt_get_tmp_attachment (BODY * a)
 {
@@ -142,7 +144,7 @@ int mutt_compose_attachment (BODY * a)
           b = mutt_read_mime_header (fp, 0);
           if (b) {
             if (b->parameter) {
-              mutt_free_parameter (&a->parameter);
+              parameter_list_wipe(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
@@ -313,7 +315,7 @@ static int is_mmnoask (const char *buf)
 
 void mutt_check_lookup_list (BODY * b, char *type, int len)
 {
-  LIST *t = MimeLookupList;
+  string_list_t *t = MimeLookupList;
   int i;
 
   for (; t; t = t->next) {
@@ -325,6 +327,8 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
       BODY tmp;
       int n;
 
+      p_clear(&tmp, 1);
+
       if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
         snprintf (type, len, "%s/%s",
                   n == TYPEAUDIO ? "audio" :
@@ -347,7 +351,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
 
 int mutt_is_autoview (BODY * b, const char *type)
 {
-  LIST *t = AutoViewList;
+  string_list_t *t = AutoViewList;
   char _type[SHORT_STRING];
   int i;
 
@@ -397,7 +401,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   int unlink_tempfile = 0;
 
   is_message = mutt_is_message_type (a->type, a->subtype);
-  if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
+  if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
       !crypt_valid_passphrase (a->hdr->security))
     return (rc);
   use_mailcap = (flag == M_MAILCAP ||
@@ -863,7 +867,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
     m->length = 0;
     m->encoding = saved_encoding;
     if (saved_parts) {
-      mutt_free_header (&m->hdr);
+      header_delete(&m->hdr);
       m->parts = saved_parts;
       m->hdr = saved_hdr;
     }