X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=118edfa5591f5796c54b87eea88a15da3035e64a;hp=63723dcd380aed9505db700fb7aaf54f3b392212;hb=cef32312aa7c285411e817304de98f3873cba6be;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/attach.c b/attach.c
index 63723dc..118edfa 100644
--- a/attach.c
+++ b/attach.c
@@ -8,47 +8,27 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# 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/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "keymap.h"
-#include "rfc1524.h"
 #include "pager.h"
 #include "copy.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 
 int mutt_get_tmp_attachment (BODY * a)
 {
   char type[STRING];
   char tempfile[_POSIX_PATH_MAX];
-  rfc1524_entry *entry = rfc1524_new_entry ();
+  rfc1524_entry *entry = rfc1524_entry_new();
   FILE *fpin = NULL, *fpout = NULL;
   struct stat st;
 
@@ -60,7 +40,7 @@ int mutt_get_tmp_attachment (BODY * a)
   rfc1524_expand_filename (entry->nametemplate, a->filename,
                            tempfile, sizeof (tempfile));
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
 
   if (stat (a->filename, &st) == -1)
     return -1;
@@ -91,7 +71,7 @@ int mutt_compose_attachment (BODY * a)
   char type[STRING];
   char command[STRING];
   char newfile[_POSIX_PATH_MAX] = "";
-  rfc1524_entry *entry = rfc1524_new_entry ();
+  rfc1524_entry *entry = rfc1524_entry_new();
   short unlink_newfile = 0;
   int rc = 0;
 
@@ -176,14 +156,14 @@ int mutt_compose_attachment (BODY * a)
               goto bailout;
             }
 
-            mutt_free_body (&b);
+            body_list_wipe(&b);
           }
         }
       }
     }
   }
   else {
-    rfc1524_free_entry (&entry);
+    rfc1524_entry_delete(&entry);
     mutt_message (_("No mailcap compose entry for %s, creating empty file."),
                   type);
     return 1;
@@ -196,7 +176,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -214,7 +194,7 @@ int mutt_edit_attachment (BODY * a)
   char type[STRING];
   char command[STRING];
   char newfile[_POSIX_PATH_MAX] = "";
-  rfc1524_entry *entry = rfc1524_new_entry ();
+  rfc1524_entry *entry = rfc1524_entry_new();
   short unlink_newfile = 0;
   int rc = 0;
 
@@ -256,7 +236,7 @@ int mutt_edit_attachment (BODY * a)
     mutt_edit_file (NONULL (Editor), a->filename);
   }
   else {
-    rfc1524_free_entry (&entry);
+    rfc1524_entry_delete(&entry);
     mutt_error (_("No mailcap edit entry for %s"), type);
     return 0;
   }
@@ -268,7 +248,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -359,7 +339,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   mutt_check_lookup_list (b, _type, sizeof (_type));
   type = _type;
 
-  if (mutt_needs_mailcap (b)) {
+  if (rfc1524_mailcap_isneeded(b)) {
     if (option (OPTIMPLICITAUTOVIEW))
       return 1;
 
@@ -401,15 +381,15 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
       !crypt_valid_passphrase (a->hdr->security))
     return (rc);
   use_mailcap = (flag == M_MAILCAP ||
-                 (flag == M_REGULAR && mutt_needs_mailcap (a)));
+                 (flag == M_REGULAR && rfc1524_mailcap_isneeded(a)));
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
 
   if (use_mailcap) {
-    entry = rfc1524_new_entry ();
+    entry = rfc1524_entry_new();
     if (!rfc1524_mailcap_lookup (a, type, entry, 0)) {
       if (flag == M_REGULAR) {
         /* fallback to view as text */
-        rfc1524_free_entry (&entry);
+        rfc1524_entry_delete(&entry);
         mutt_error _("No matching mailcap entry found.  Viewing as text.");
 
         flag = M_AS_TEXT;
@@ -588,7 +568,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 return_error:
 
   if (entry)
-    rfc1524_free_entry (&entry);
+    rfc1524_entry_delete(&entry);
   if (fp && tempfile[0])
     mutt_unlink (tempfile);
   else if (unlink_tempfile)
@@ -895,7 +875,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     rfc1524_entry *entry;
     int piped = FALSE;
 
-    entry = rfc1524_new_entry ();
+    entry = rfc1524_entry_new();
     rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
     if (rfc1524_expand_filename (entry->nametemplate, a->filename,
                                  newfile, sizeof (newfile))) {
@@ -903,7 +883,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES) {
-            rfc1524_free_entry (&entry);
+            rfc1524_entry_delete(&entry);
             return 0;
           }
           m_strcpy(newfile, sizeof(newfile), a->filename);
@@ -927,14 +907,14 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     if (piped) {
       if ((ifp = fopen (newfile, "r")) == NULL) {
         mutt_perror ("fopen");
-        rfc1524_free_entry (&entry);
+        rfc1524_entry_delete(&entry);
         return (0);
       }
 
       if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
         mutt_perror (_("Can't create filter"));
 
-        rfc1524_free_entry (&entry);
+        rfc1524_entry_delete(&entry);
         safe_fclose (&ifp);
         return 0;
       }
@@ -954,7 +934,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     else if (unlink_newfile)
       unlink (newfile);
 
-    rfc1524_free_entry (&entry);
+    rfc1524_entry_delete(&entry);
     return (1);
   }