Rocco Rutte:

[apps/madmutt.git] / attach.c

diff --git a/attach.c b/attach.c
index 6976f6e..c695e34 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -13,13 +13,15 @@
 #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 "rfc1524.h"
 #include "mime.h"
 #include "pager.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "rfc1524.h"
 #include "mime.h"
 #include "pager.h"

-#include "mailbox.h"

 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"


@@ -27,6 +29,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"

+#include "lib/debug.h"

 
 #include <ctype.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <stdlib.h>


@@ -60,14 +63,14 @@ int mutt_get_tmp_attachment (BODY * a)
 
   if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {      /* __FOPEN_CHECKED__ */
     mutt_copy_stream (fpin, fpout);
 
   if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {      /* __FOPEN_CHECKED__ */
     mutt_copy_stream (fpin, fpout);

-    mutt_str_replace (&a->filename, tempfile);
+    str_replace (&a->filename, tempfile);

     a->unlink = 1;
 
     if (a->stamp >= st.st_mtime)
       mutt_stamp_attachment (a);
   }
   else
     a->unlink = 1;
 
     if (a->stamp >= st.st_mtime)
       mutt_stamp_attachment (a);
   }
   else

-    mutt_perror (fpin ? tempfile : a->filename);
+    mutt_perror(fpin ? tempfile : a->filename);

 
   if (fpin)
     fclose (fpin);
 
   if (fpin)
     fclose (fpin);


@@ -98,8 +101,7 @@ int mutt_compose_attachment (BODY * a)
         strfcpy (command, entry->composecommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
         strfcpy (command, entry->composecommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {

-        dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n",
-                    a->filename, 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)
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)


@@ -129,7 +131,7 @@ int mutt_compose_attachment (BODY * a)
           char tempfile[_POSIX_PATH_MAX];
 
           if ((fp = safe_fopen (a->filename, "r")) == NULL) {
           char tempfile[_POSIX_PATH_MAX];
 
           if ((fp = safe_fopen (a->filename, "r")) == NULL) {

-            mutt_perror _("Failure to open file to parse headers.");
+            mutt_perror (_("Failure to open file to parse headers."));

 
             goto bailout;
           }
 
             goto bailout;
           }


@@ -142,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;
             }


@@ -157,7 +159,7 @@ int mutt_compose_attachment (BODY * a)
             fseek (fp, b->offset, 0);
             mutt_mktemp (tempfile);
             if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
             fseek (fp, b->offset, 0);
             mutt_mktemp (tempfile);
             if ((tfp = safe_fopen (tempfile, "w")) == NULL) {

-              mutt_perror _("Failure to open file to strip headers.");
+              mutt_perror (_("Failure to open file to strip headers."));

 
               goto bailout;
             }
 
               goto bailout;
             }


@@ -166,7 +168,7 @@ int mutt_compose_attachment (BODY * a)
             fclose (tfp);
             mutt_unlink (a->filename);
             if (mutt_rename_file (tempfile, a->filename) != 0) {
             fclose (tfp);
             mutt_unlink (a->filename);
             if (mutt_rename_file (tempfile, a->filename) != 0) {

-              mutt_perror _("Failure to rename file.");
+              mutt_perror (_("Failure to rename file."));

 
               goto bailout;
             }
 
               goto bailout;
             }


@@ -220,8 +222,7 @@ int mutt_edit_attachment (BODY * a)
       strfcpy (command, entry->editcommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
       strfcpy (command, entry->editcommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {

-        dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n",
-                    a->filename, 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)
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)


@@ -237,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);


@@ -274,7 +278,7 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {

-    if (mutt_strcmp (p, "1") == 0)
+    if (str_cmp (p, "1") == 0)

       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));
       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));


@@ -292,8 +296,8 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
         }
       }
       else {

-        lng = mutt_strlen (p);
-        if (buf[lng] == '/' && mutt_strncasecmp (buf, p, lng) == 0)
+        lng = str_len (p);
+        if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)

           return (1);
       }
 
           return (1);
       }
 


@@ -310,7 +314,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
   int i;
 
   for (; t; t = t->next) {

-    i = mutt_strlen (t->data) - 1;
+    i = str_len (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) {
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {


@@ -328,13 +332,12 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
                   n == TYPEMULTIPART ? "multipart" :
                   n == TYPETEXT ? "text" :
                   n == TYPEVIDEO ? "video" : "other", tmp.subtype);
                   n == TYPEMULTIPART ? "multipart" :
                   n == TYPETEXT ? "text" :
                   n == TYPEVIDEO ? "video" : "other", tmp.subtype);

-        dprint (1, (debugfile, "mutt_check_lookup_list: \"%s\" -> %s\n",
-                    b->filename, type));
+        debug_print (1, ("\"%s\" -> %s\n", b->filename, type));

       }
       if (tmp.subtype)
       }
       if (tmp.subtype)

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

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

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

     }
   }
 }
     }
   }
 }


@@ -362,7 +365,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
   }
 
   for (; t; t = t->next) {

-    i = mutt_strlen (t->data) - 1;
+    i = str_len (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)
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0)


@@ -423,7 +426,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {

-      fname = safe_strdup (a->filename);
+      fname = str_dup (a->filename);

       mutt_sanitize_filename (fname, 1);
     }
     else
       mutt_sanitize_filename (fname, 1);
     }
     else


@@ -431,7 +434,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
     if (rfc1524_expand_filename (entry->nametemplate, fname,
                                  tempfile, sizeof (tempfile))) {
 
     if (rfc1524_expand_filename (entry->nametemplate, fname,
                                  tempfile, sizeof (tempfile))) {

-      if (fp == NULL && mutt_strcmp (tempfile, a->filename)) {
+      if (fp == NULL && str_cmp (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)
         /* send case: the file is already there */
         if (safe_symlink (a->filename, tempfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)


@@ -449,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;
     }


@@ -463,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);


@@ -624,7 +627,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
       thepid = mutt_create_filter (path, &s.fpout, NULL, NULL);
 
     if (thepid < 0) {
       thepid = mutt_create_filter (path, &s.fpout, NULL, NULL);
 
     if (thepid < 0) {

-      mutt_perror _("Can't create filter");
+      mutt_perror (_("Can't create filter"));

 
       goto bail;
     }
 
       goto bail;
     }


@@ -653,7 +656,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
       thepid = mutt_create_filter (path, &ofp, NULL, NULL);
 
     if (thepid < 0) {
       thepid = mutt_create_filter (path, &ofp, NULL, NULL);
 
     if (thepid < 0) {

-      mutt_perror _("Can't create filter");
+      mutt_perror (_("Can't create filter"));

 
       safe_fclose (&ifp);
       goto bail;
 
       safe_fclose (&ifp);
       goto bail;


@@ -892,7 +895,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     rfc1524_entry *entry;
     int piped = FALSE;
 
     rfc1524_entry *entry;
     int piped = FALSE;
 

-    dprint (2, (debugfile, "Using mailcap...\n"));
+    debug_print (2, ("Using mailcap...\n"));

 
     entry = rfc1524_new_entry ();
     rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
 
     entry = rfc1524_new_entry ();
     rfc1524_mailcap_lookup (a, type, entry, M_PRINT);


@@ -931,7 +934,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
       }
 
       if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
       }
 
       if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {

-        mutt_perror _("Can't create filter");
+        mutt_perror (_("Can't create filter"));

 
         rfc1524_free_entry (&entry);
         safe_fclose (&ifp);
 
         rfc1524_free_entry (&entry);
         safe_fclose (&ifp);


@@ -972,8 +975,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     mutt_mktemp (newfile);
     if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
 
     mutt_mktemp (newfile);
     if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
 

-      dprint (2,
-              (debugfile, "successfully decoded %s type attachment to %s\n",
+      debug_print (2, ("successfully decoded %s type attachment to %s\n",

                type, newfile));
 
       if ((ifp = fopen (newfile, "r")) == NULL) {
                type, newfile));
 
       if ((ifp = fopen (newfile, "r")) == NULL) {


@@ -981,17 +983,17 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         goto bail0;
       }
 
         goto bail0;
       }
 

-      dprint (2, (debugfile, "successfully opened %s read-only\n", newfile));
+      debug_print (2, ("successfully opened %s read-only\n", newfile));

 
       mutt_endwin (NULL);
       if ((thepid =
            mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {
 
       mutt_endwin (NULL);
       if ((thepid =
            mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {

-        mutt_perror _("Can't create filter");
+        mutt_perror (_("Can't create filter"));

 
         goto bail0;
       }
 
 
         goto bail0;
       }
 

-      dprint (2, (debugfile, "Filter created.\n"));
+      debug_print (2, ("Filter created.\n"));

 
       mutt_copy_stream (ifp, fpout);
 
 
       mutt_copy_stream (ifp, fpout);
 


@@ -1014,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);
+}