Rocco Rutte:

[apps/madmutt.git] / attach.c

diff --git a/attach.c b/attach.c
index c87f9cf..c695e34 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -13,6 +13,9 @@
 #endif
 
 #include "mutt.h"
 #endif
 
 #include "mutt.h"

+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"

 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"


@@ -141,12 +144,12 @@ int mutt_compose_attachment (BODY * a)
               b->parameter = NULL;
             }
             if (b->description) {
               b->parameter = NULL;
             }
             if (b->description) {

-              FREE (&a->description);
+              mem_free (&a->description);

               a->description = b->description;
               b->description = NULL;
             }
             if (b->form_name) {
               a->description = b->description;
               b->description = NULL;
             }
             if (b->form_name) {

-              FREE (&a->form_name);
+              mem_free (&a->form_name);

               a->form_name = b->form_name;
               b->form_name = NULL;
             }
               a->form_name = b->form_name;
               b->form_name = NULL;
             }


@@ -235,17 +238,20 @@ int mutt_edit_attachment (BODY * a)
                                   command, sizeof (command))) {
         /* For now, editing requires a file, no piping */
         mutt_error _("Mailcap Edit entry requires %%s");
                                   command, sizeof (command))) {
         /* For now, editing requires a file, no piping */
         mutt_error _("Mailcap Edit entry requires %%s");

+        goto bailout;

       }
       else {
         mutt_endwin (NULL);
       }
       else {
         mutt_endwin (NULL);

-        if (mutt_system (command) == -1)
+        if (mutt_system (command) == -1) {

           mutt_error (_("Error running \"%s\"!"), command);
           mutt_error (_("Error running \"%s\"!"), command);

+          goto bailout;
+        }

       }
     }
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */
       }
     }
   }
   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);
   }
   else {
     rfc1524_free_entry (&entry);


@@ -329,9 +335,9 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
         debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)
         debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)

-        FREE (&tmp.subtype);
+        mem_free (&tmp.subtype);

       if (tmp.xtype)
       if (tmp.xtype)

-        FREE (&tmp.xtype);
+        mem_free (&tmp.xtype);

     }
   }
 }
     }
   }
 }


@@ -446,7 +452,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
     if (fp) {
       /* recv case: we need to save the attachment to a file */
 
     if (fp) {
       /* recv case: we need to save the attachment to a file */

-      FREE (&fname);
+      mem_free (&fname);

       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }
       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }


@@ -460,7 +466,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     if (fp && !use_mailcap && a->filename) {
       /* recv case */
       strfcpy (pagerfile, a->filename, sizeof (pagerfile));
     if (fp && !use_mailcap && a->filename) {
       /* recv case */
       strfcpy (pagerfile, a->filename, sizeof (pagerfile));

-      mutt_adv_mktemp (pagerfile, sizeof (pagerfile));
+      mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));

     }
     else
       mutt_mktemp (pagerfile);
     }
     else
       mutt_mktemp (pagerfile);


@@ -1010,3 +1016,30 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     return 0;
   }
 }
     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++;
+    }
+  }
+  fclose (fp);
+
+  return (found);
+}