X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=4e6fff13a979dd352b4e00a4b2ca4fb752f6b097;hp=c87f9cf30579b236b33cbe9bc6a4d313b7245e2f;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/attach.c b/attach.c
index c87f9cf..4e6fff1 100644
--- a/attach.c
+++ b/attach.c
@@ -8,40 +8,27 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#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 "mutt_menu.h"
-#include "mutt_curses.h"
+#include "handler.h"
+#include "recvattach.h"
 #include "keymap.h"
-#include "rfc1524.h"
-#include "mime.h"
 #include "pager.h"
 #include "copy.h"
-#include "mx.h"
-#include "mutt_crypt.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.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)
 {
   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;
 
@@ -53,14 +40,14 @@ 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;
 
   if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {      /* __FOPEN_CHECKED__ */
     mutt_copy_stream (fpin, fpout);
-    str_replace (&a->filename, tempfile);
+    m_strreplace(&a->filename, tempfile);
     a->unlink = 1;
 
     if (a->stamp >= st.st_mtime)
@@ -69,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;
 }
@@ -84,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;
 
@@ -93,12 +78,11 @@ int mutt_compose_attachment (BODY * a)
     if (entry->composecommand || entry->composetypecommand) {
 
       if (entry->composetypecommand)
-        strfcpy (command, entry->composetypecommand, sizeof (command));
+        m_strcpy(command, sizeof(command), entry->composetypecommand);
       else
-        strfcpy (command, entry->composecommand, sizeof (command));
+        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)
@@ -108,7 +92,7 @@ int mutt_compose_attachment (BODY * a)
           unlink_newfile = 1;
       }
       else
-        strfcpy (newfile, a->filename, sizeof (newfile));
+        m_strcpy(newfile, sizeof(newfile), a->filename);
 
       if (rfc1524_expand_command (a, newfile, type,
                                   command, sizeof (command))) {
@@ -125,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."));
@@ -135,34 +118,35 @@ int mutt_compose_attachment (BODY * a)
 
           b = mutt_read_mime_header (fp, 0);
           if (b) {
+            char tempfile[_POSIX_PATH_MAX];
+
             if (b->parameter) {
-              mutt_free_parameter (&a->parameter);
+              parameter_list_wipe(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
             if (b->description) {
-              FREE (&a->description);
+              p_delete(&a->description);
               a->description = b->description;
               b->description = NULL;
             }
             if (b->form_name) {
-              FREE (&a->form_name);
+              p_delete(&a->form_name);
               a->form_name = b->form_name;
               b->form_name = NULL;
             }
 
             /* Remove headers by copying out data to another file, then 
              * copying the file back */
-            fseek (fp, b->offset, 0);
-            mutt_mktemp (tempfile);
-            if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
+            fseeko (fp, b->offset, 0);
+            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."));
@@ -170,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;
@@ -190,7 +174,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -208,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;
 
@@ -216,11 +200,10 @@ int mutt_edit_attachment (BODY * a)
   if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT)) {
     if (entry->editcommand) {
 
-      strfcpy (command, entry->editcommand, sizeof (command));
+      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;
@@ -229,26 +212,29 @@ int mutt_edit_attachment (BODY * a)
           unlink_newfile = 1;
       }
       else
-        strfcpy (newfile, a->filename, sizeof (newfile));
+        m_strcpy(newfile, sizeof(newfile), a->filename);
 
       if (rfc1524_expand_command (a, newfile, type,
                                   command, sizeof (command))) {
         /* For now, editing requires a file, no piping */
         mutt_error _("Mailcap Edit entry requires %%s");
+        goto bailout;
       }
       else {
         mutt_endwin (NULL);
-        if (mutt_system (command) == -1)
+        if (mutt_system (command) == -1) {
           mutt_error (_("Error running \"%s\"!"), command);
+          goto bailout;
+        }
       }
     }
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */
-    mutt_edit_file (NONULL (Editor), newfile);
+    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;
   }
@@ -260,7 +246,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -272,10 +258,10 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
-    if (str_cmp (p, "1") == 0)
+    if (m_strcmp(p, "1") == 0)
       return (1);
 
-    strfcpy (tmp, p, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), p);
     p = tmp;
 
     while ((p = strtok (p, ",")) != NULL) {
@@ -290,8 +276,8 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = str_len (p);
-        if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
+        lng = m_strlen(p);
+        if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
           return (1);
       }
 
@@ -304,18 +290,20 @@ 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) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          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" :
@@ -326,31 +314,30 @@ 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)
-        FREE (&tmp.subtype);
+        p_delete(&tmp.subtype);
       if (tmp.xtype)
-        FREE (&tmp.xtype);
+        p_delete(&tmp.xtype);
     }
   }
 }
 
 int mutt_is_autoview (BODY * b, const char *type)
 {
-  LIST *t = AutoViewList;
+  string_list_t *t = AutoViewList;
   char _type[SHORT_STRING];
   int i;
 
   if (!type)
     snprintf (_type, sizeof (_type), "%s/%s", TYPE (b), b->subtype);
   else
-    strncpy (_type, type, sizeof (_type));
+    m_strcpy(_type, sizeof(_type), 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;
 
@@ -359,7 +346,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0)
@@ -388,19 +375,19 @@ 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 ||
-                 (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;
@@ -417,10 +404,10 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
       goto return_error;
     }
-    strfcpy (command, entry->command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->command);
 
     if (fp) {
-      fname = str_dup (a->filename);
+      fname = m_strdup(a->filename);
       mutt_sanitize_filename (fname, 1);
     }
     else
@@ -428,12 +415,12 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
     if (rfc1524_expand_filename (entry->nametemplate, fname,
                                  tempfile, sizeof (tempfile))) {
-      if (fp == NULL && str_cmp (tempfile, a->filename)) {
+      if (fp == NULL && m_strcmp(tempfile, a->filename)) {
         /* send case: the file is already there */
         if (safe_symlink (a->filename, tempfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               == M_YES)
-            strfcpy (tempfile, a->filename, sizeof (tempfile));
+            m_strcpy(tempfile, sizeof(tempfile), a->filename);
           else
             goto return_error;
         }
@@ -442,11 +429,11 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
       }
     }
     else if (fp == NULL)        /* send case */
-      strfcpy (tempfile, a->filename, sizeof (tempfile));
+      m_strcpy(tempfile, sizeof(tempfile), a->filename);
 
     if (fp) {
       /* recv case: we need to save the attachment to a file */
-      FREE (&fname);
+      p_delete(&fname);
       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }
@@ -459,11 +446,11 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   if (use_pager) {
     if (fp && !use_mailcap && a->filename) {
       /* recv case */
-      strfcpy (pagerfile, a->filename, sizeof (pagerfile));
-      mutt_adv_mktemp (pagerfile, sizeof (pagerfile));
-    }
-    else
+      m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
+      mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
+    } else {
       mutt_mktemp (pagerfile);
+    }
   }
 
   if (use_mailcap) {
@@ -547,7 +534,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     }
 
     if (a->description)
-      strfcpy (descrip, a->description, sizeof (descrip));
+      m_strcpy(descrip, sizeof(descrip), a->description);
     else if (a->filename)
       snprintf (descrip, sizeof (descrip), "---Attachment: %s : %s",
                 a->filename, type);
@@ -559,18 +546,18 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
   if (use_pager) {
     pager_t info;
+    p_clear(&info, 1);
 
-    memset (&info, 0, sizeof (info));
-    info.fp = fp;
+    info.fp  = fp;
     info.bdy = a;
     info.ctx = Context;
     info.idx = idx;
     info.idxlen = idxlen;
     info.hdr = hdr;
 
-    rc = mutt_do_pager (descrip, pagerfile,
-                        M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE :
-                                              0), &info);
+    rc = mutt_do_pager(descrip, pagerfile,
+                       M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+                       &info);
     *pagerfile = '\0';
   }
   else
@@ -579,7 +566,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)
@@ -609,16 +596,13 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
 
   if (fp) {
     /* recv case */
-
     STATE s;
-
-    memset (&s, 0, sizeof (STATE));
+    p_clear(&s, 1);
 
     if (outfile && *outfile)
-      thepid =
-        mutt_create_filter_fd (path, &s.fpout, NULL, NULL, -1, out, -1);
+      thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
     else
-      thepid = mutt_create_filter (path, &s.fpout, NULL, NULL);
+      thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
 
     if (thepid < 0) {
       mutt_perror (_("Can't create filter"));
@@ -628,7 +612,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 */
@@ -652,13 +636,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;
@@ -718,7 +702,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
       hn->msgno = hdr->msgno;   /* required for MH/maildir */
       hn->read = 1;
 
-      fseek (fp, m->offset, 0);
+      fseeko (fp, m->offset, 0);
       if (fgets (buf, sizeof (buf), fp) == NULL)
         return -1;
       if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
@@ -747,22 +731,21 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
       /* In recv mode, extract from folder and decode */
 
       STATE s;
+      p_clear(&s, 1);
 
-      memset (&s, 0, sizeof (s));
       if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
         mutt_perror ("fopen");
         return (-1);
       }
-      fseek ((s.fpin = fp), m->offset, 0);
+      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;
@@ -774,19 +757,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;
@@ -801,7 +784,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
   BODY *saved_parts = NULL;
   HEADER *saved_hdr = NULL;
 
-  memset (&s, 0, sizeof (s));
+  p_clear(&s, 1);
   s.flags = displaying;
 
   if (flags == M_SAVE_APPEND)
@@ -823,7 +806,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);
     }
 
@@ -852,16 +835,16 @@ 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;
     if (saved_parts) {
-      mutt_free_header (&m->hdr);
+      header_delete(&m->hdr);
       m->parts = saved_parts;
       m->hdr = saved_hdr;
     }
-    fclose (s.fpin);
+    m_fclose(&s.fpin);
   }
 
   return (0);
@@ -889,9 +872,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))) {
@@ -899,10 +880,10 @@ 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;
           }
-          strfcpy (newfile, a->filename, sizeof (newfile));
+          m_strcpy(newfile, sizeof(newfile), a->filename);
         }
         else
           unlink_newfile = 1;
@@ -913,9 +894,9 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     if (fp)
       mutt_save_attachment (fp, a, newfile, 0, NULL);
 
-    strfcpy (command, entry->printcommand, sizeof (command));
-    piped =
-      rfc1524_expand_command (a, newfile, type, command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->printcommand);
+    piped = rfc1524_expand_command(a, newfile, type, command,
+                                   sizeof(command));
 
     mutt_endwin (NULL);
 
@@ -923,20 +904,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);
     }
@@ -950,7 +931,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);
   }
 
@@ -969,16 +950,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) {
@@ -987,20 +963,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;
   }
@@ -1010,3 +984,30 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     return 0;
   }
 }
+
+int mutt_attach_check (HEADER* hdr) {
+  int found = 0;
+  char buf[LONG_STRING];
+  char *p = NULL;
+  FILE* fp = NULL;
+  regmatch_t pmatch[1];
+
+  if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) ||
+      (fp = safe_fopen (hdr->content->filename, "r")) == NULL)
+    return (0);
+
+  while (!found && fgets (buf, sizeof (buf), fp)) {
+    p = buf;
+    while (p && *p) {
+      if (regexec ((regex_t*) AttachRemindRegexp.rx, p, 1,
+                  pmatch, 0) == 0) {
+        found = 1;
+        break;
+      }
+      p++;
+    }
+  }
+  m_fclose(&fp);
+
+  return (found);
+}