X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=a36fdf4abadb76af7a5573a9a2cb03bfbddeb29e;hp=5f588b707109065661736b7d6425c2290247a765;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3

diff --git a/attach.c b/attach.c
index 5f588b7..a36fdf4 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_delete(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
@@ -322,9 +324,11 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {
 
-      BODY tmp = { 0 };
+      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" :
@@ -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;
     }