Rocco Rutte:

[apps/madmutt.git] / attach.c

diff --git a/attach.c b/attach.c
index b14ee86..a644784 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -13,6 +13,9 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -26,6 +29,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -66,7 +70,7 @@ int mutt_get_tmp_attachment (BODY * a)
       mutt_stamp_attachment (a);
   }
   else
-    mutt_perror (fpin ? tempfile : a->filename);
+    mutt_perror(fpin ? tempfile : a->filename);
 
   if (fpin)
     fclose (fpin);
@@ -97,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))) {
-        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)
@@ -128,7 +131,7 @@ int mutt_compose_attachment (BODY * a)
           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;
           }
@@ -141,12 +144,12 @@ int mutt_compose_attachment (BODY * a)
               b->parameter = NULL;
             }
             if (b->description) {
-              FREE (&a->description);
+              mem_free (&a->description);
               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;
             }
@@ -156,7 +159,7 @@ int mutt_compose_attachment (BODY * a)
             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;
             }
@@ -165,7 +168,7 @@ int mutt_compose_attachment (BODY * a)
             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;
             }
@@ -219,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))) {
-        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)
@@ -246,7 +248,7 @@ int mutt_edit_attachment (BODY * a)
   }
   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);
@@ -273,7 +275,7 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
-    if (safe_strcmp (p, "1") == 0)
+    if (str_cmp (p, "1") == 0)
       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));
@@ -291,8 +293,8 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = safe_strlen (p);
-        if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0)
+        lng = str_len (p);
+        if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
           return (1);
       }
 
@@ -309,7 +311,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
-    i = safe_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) {
@@ -327,13 +329,12 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
                   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)
-        FREE (&tmp.subtype);
+        mem_free (&tmp.subtype);
       if (tmp.xtype)
-        FREE (&tmp.xtype);
+        mem_free (&tmp.xtype);
     }
   }
 }
@@ -361,7 +362,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = safe_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)
@@ -422,7 +423,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {
-      fname = safe_strdup (a->filename);
+      fname = str_dup (a->filename);
       mutt_sanitize_filename (fname, 1);
     }
     else
@@ -430,7 +431,7 @@ 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 && safe_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)
@@ -448,7 +449,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 */
-      FREE (&fname);
+      mem_free (&fname);
       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }
@@ -462,7 +463,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));
-      mutt_adv_mktemp (pagerfile, sizeof (pagerfile));
+      mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
     }
     else
       mutt_mktemp (pagerfile);
@@ -623,7 +624,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
       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;
     }
@@ -652,7 +653,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
       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;
@@ -891,7 +892,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     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);
@@ -930,7 +931,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
       }
 
       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);
@@ -971,8 +972,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     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) {
@@ -980,17 +980,17 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         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_perror _("Can't create filter");
+        mutt_perror (_("Can't create filter"));
 
         goto bail0;
       }
 
-      dprint (2, (debugfile, "Filter created.\n"));
+      debug_print (2, ("Filter created.\n"));
 
       mutt_copy_stream (ifp, fpout);