X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=54bfc732e209e3187dc5f7c8547ec75f4b736c73;hp=720e17a4016bba61aa3dc153b74bacfd650f5dab;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/attach.c b/attach.c
index 720e17a..54bfc73 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 <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 "mutt_menu.h"
 #include "keymap.h"
-#include "rfc1524.h"
 #include "pager.h"
 #include "copy.h"
-#include "mx.h"
 #include <lib-crypt/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>
-
 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;
@@ -76,10 +56,8 @@ int mutt_get_tmp_attachment (BODY * a)
   else
     mutt_perror(fpin ? tempfile : a->filename);
 
-  if (fpin)
-    fclose (fpin);
-  if (fpout)
-    fclose (fpout);
+  m_fclose(&fpin);
+  m_fclose(&fpout);
 
   return a->unlink ? 0 : -1;
 }
@@ -91,7 +69,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;
 
@@ -105,7 +83,6 @@ int mutt_compose_attachment (BODY * a)
         m_strcpy(command, sizeof(command), entry->composecommand);
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
-        debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)
@@ -132,7 +109,6 @@ int mutt_compose_attachment (BODY * a)
         if (r != -1 && entry->composetypecommand) {
           BODY *b;
           FILE *fp, *tfp;
-          char tempfile[_POSIX_PATH_MAX];
 
           if ((fp = safe_fopen (a->filename, "r")) == NULL) {
             mutt_perror (_("Failure to open file to parse headers."));
@@ -142,8 +118,10 @@ int mutt_compose_attachment (BODY * a)
 
           b = mutt_read_mime_header (fp, 0);
           if (b) {
+            char tempfile[_POSIX_PATH_MAX];
+
             if (b->parameter) {
-              parameter_delete(&a->parameter);
+              parameter_list_wipe(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
@@ -161,15 +139,14 @@ int mutt_compose_attachment (BODY * a)
             /* Remove headers by copying out data to another file, then 
              * copying the file back */
             fseeko (fp, b->offset, 0);
-            mutt_mktemp (tempfile);
-            if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
+            tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+            if (!tfp) {
               mutt_perror (_("Failure to open file to strip headers."));
-
               goto bailout;
             }
             mutt_copy_stream (fp, tfp);
-            fclose (fp);
-            fclose (tfp);
+            m_fclose(&fp);
+            m_fclose(&tfp);
             mutt_unlink (a->filename);
             if (mutt_rename_file (tempfile, a->filename) != 0) {
               mutt_perror (_("Failure to rename file."));
@@ -177,14 +154,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;
@@ -197,7 +174,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -215,7 +192,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;
 
@@ -226,8 +203,7 @@ int mutt_edit_attachment (BODY * a)
       m_strcpy(command, sizeof(command), entry->editcommand);
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
-        debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
-        if (safe_symlink (a->filename, newfile) == -1) {
+          if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)
             goto bailout;
@@ -258,7 +234,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;
   }
@@ -270,7 +246,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -314,7 +290,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) {
@@ -338,7 +314,6 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
                   n == TYPEMULTIPART ? "multipart" :
                   n == TYPETEXT ? "text" :
                   n == TYPEVIDEO ? "video" : "other", tmp.subtype);
-        debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)
         p_delete(&tmp.subtype);
@@ -350,7 +325,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;
 
@@ -362,7 +337,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;
 
@@ -398,21 +373,22 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   rfc1524_entry *entry = NULL;
   int rc = -1;
   int unlink_tempfile = 0;
+  int pagerfd = -1;
 
   is_message = mutt_is_message_type (a->type, a->subtype);
   if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
       !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;
@@ -472,23 +448,21 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     if (fp && !use_mailcap && a->filename) {
       /* recv case */
       m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
-      mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
+      pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir), pagerfile);
+    } else {
+      pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir), NULL);
     }
-    else
-      mutt_mktemp (pagerfile);
   }
 
   if (use_mailcap) {
     pid_t thepid = 0;
-    int tempfd = -1, pagerfd = -1;
+    int tempfd = -1;
 
     if (!use_pager)
       mutt_endwin (NULL);
 
     if (use_pager || use_pipe) {
-      if (use_pager
-          && ((pagerfd = safe_open (pagerfile, O_CREAT | O_EXCL | O_WRONLY))
-              == -1)) {
+      if (use_pager && pagerfd == -1) {
         mutt_perror ("open");
         goto return_error;
       }
@@ -591,7 +565,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)
@@ -637,7 +611,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
 
     s.fpin = fp;
     mutt_decode_attachment (b, &s);
-    safe_fclose (&s.fpout);
+    m_fclose(&s.fpout);
   }
   else {
     /* send case */
@@ -661,13 +635,13 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
     if (thepid < 0) {
       mutt_perror (_("Can't create filter"));
 
-      safe_fclose (&ifp);
+      m_fclose(&ifp);
       goto bail;
     }
 
     mutt_copy_stream (ifp, ofp);
-    safe_fclose (&ofp);
-    safe_fclose (&ifp);
+    m_fclose(&ofp);
+    m_fclose(&ifp);
   }
 
   rv = 1;
@@ -765,13 +739,12 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
       fseeko ((s.fpin = fp), m->offset, 0);
       mutt_decode_attachment (m, &s);
 
-      if (fclose (s.fpout) != 0) {
+      if (m_fclose(&s.fpout) != 0) {
         mutt_perror ("fclose");
         return (-1);
       }
     }
-  }
-  else {
+  } else {
     /* In send mode, just copy file */
 
     FILE *ofp, *nfp;
@@ -783,19 +756,19 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
 
     if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
       mutt_perror ("fopen");
-      safe_fclose (&ofp);
+      m_fclose(&ofp);
       return (-1);
     }
 
     if (mutt_copy_stream (ofp, nfp) == -1) {
       mutt_error _("Write fault!");
 
-      safe_fclose (&ofp);
-      safe_fclose (&nfp);
+      m_fclose(&ofp);
+      m_fclose(&nfp);
       return (-1);
     }
-    safe_fclose (&ofp);
-    safe_fclose (&nfp);
+    m_fclose(&ofp);
+    m_fclose(&nfp);
   }
 
   return 0;
@@ -832,7 +805,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
 
     if (stat (m->filename, &st) == -1) {
       mutt_perror ("stat");
-      fclose (s.fpout);
+      m_fclose(&s.fpout);
       return (-1);
     }
 
@@ -861,7 +834,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
 
   mutt_body_handler (m, &s);
 
-  fclose (s.fpout);
+  m_fclose(&s.fpout);
   if (fp == NULL) {
     m->length = 0;
     m->encoding = saved_encoding;
@@ -870,7 +843,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
       m->parts = saved_parts;
       m->hdr = saved_hdr;
     }
-    fclose (s.fpin);
+    m_fclose(&s.fpin);
   }
 
   return (0);
@@ -898,9 +871,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     rfc1524_entry *entry;
     int piped = FALSE;
 
-    debug_print (2, ("Using mailcap...\n"));
-
-    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))) {
@@ -908,7 +879,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);
@@ -932,20 +903,20 @@ 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);
-        safe_fclose (&ifp);
+        rfc1524_entry_delete(&entry);
+        m_fclose(&ifp);
         return 0;
       }
       mutt_copy_stream (ifp, fpout);
-      safe_fclose (&fpout);
-      safe_fclose (&ifp);
+      m_fclose(&fpout);
+      m_fclose(&ifp);
       if (mutt_wait_filter (thepid) || option (OPTWAITKEY))
         mutt_any_key_to_continue (NULL);
     }
@@ -959,7 +930,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);
   }
 
@@ -978,16 +949,11 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     mutt_mktemp (newfile);
     if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
 
-      debug_print (2, ("successfully decoded %s type attachment to %s\n",
-               type, newfile));
-
       if ((ifp = fopen (newfile, "r")) == NULL) {
         mutt_perror ("fopen");
         goto bail0;
       }
 
-      debug_print (2, ("successfully opened %s read-only\n", newfile));
-
       mutt_endwin (NULL);
       if ((thepid =
            mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {
@@ -996,20 +962,18 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         goto bail0;
       }
 
-      debug_print (2, ("Filter created.\n"));
-
       mutt_copy_stream (ifp, fpout);
 
-      safe_fclose (&fpout);
-      safe_fclose (&ifp);
+      m_fclose(&fpout);
+      m_fclose(&ifp);
 
       if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
         mutt_any_key_to_continue (NULL);
       rc = 1;
     }
   bail0:
-    safe_fclose (&ifp);
-    safe_fclose (&fpout);
+    m_fclose(&ifp);
+    m_fclose(&fpout);
     mutt_unlink (newfile);
     return rc;
   }
@@ -1042,7 +1006,7 @@ int mutt_attach_check (HEADER* hdr) {
       p++;
     }
   }
-  fclose (fp);
+  m_fclose(&fp);
 
   return (found);
 }