simplifications.

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 5d9af6d..e561363 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -7,28 +7,15 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
 
 #include <lib-ui/curses.h>
 
+#include <lib-sys/unix.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
@@ -781,7 +768,7 @@ static int alternative_handler (BODY * a, STATE * s)
 
     mustfree = 1;
     fstat (fileno (s->fpin), &st);
-    b = mutt_new_body ();
+    b = body_new();
     b->length = (long) st.st_size;
     b->parts = mutt_parse_multipart(s->fpin,
                                     parameter_getval(a->parameter, "boundary"),
@@ -903,7 +890,7 @@ static int alternative_handler (BODY * a, STATE * s)
   }
 
   if (mustfree)
-    mutt_free_body (&a);
+    body_list_wipe(&a);
 
   return (rc);
 }
@@ -920,7 +907,7 @@ static int message_handler (BODY * a, STATE * s)
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED) {
     fstat (fileno (s->fpin), &st);
-    b = mutt_new_body ();
+    b = body_new();
     b->length = (long) st.st_size;
     b->parts = mutt_parse_messageRFC822 (s->fpin, b);
   }
@@ -944,7 +931,7 @@ static int message_handler (BODY * a, STATE * s)
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED)
-    mutt_free_body (&b);
+    body_list_wipe(&b);
 
   return (rc);
 }
@@ -995,7 +982,7 @@ static int multipart_handler (BODY * a, STATE * s)
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED) {
     fstat (fileno (s->fpin), &st);
-    b = mutt_new_body ();
+    b = body_new();
     b->length = (long) st.st_size;
     b->parts = mutt_parse_multipart(s->fpin,
                                     parameter_getval(a->parameter, "boundary"),
@@ -1045,7 +1032,7 @@ static int multipart_handler (BODY * a, STATE * s)
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED)
-    mutt_free_body (&b);
+    body_list_wipe(&b);
 
   return (rc);
 }