X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=5e43321884e0b1657d128fad43c16b07f4848d30;hp=e352c4a0ec50e963c8dafc24306046e3e380a9d5;hb=a9533eed32ccd9bae6f6f42980d0478f84dc2551;hpb=108f3c7ab59844591f7540347914ea57be5245e2

diff --git a/attach.c b/attach.c
index e352c4a..5e43321 100644
--- a/attach.c
+++ b/attach.c
@@ -26,7 +26,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
 
 #include <lib-sys/unix.h>
 
@@ -39,7 +38,6 @@
 #include "handler.h"
 #include "recvattach.h"
 #include "keymap.h"
-#include "rfc1524.h"
 #include "pager.h"
 #include "copy.h"
 #include "mx.h"
@@ -49,7 +47,7 @@ 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;
 
@@ -61,7 +59,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;
@@ -92,7 +90,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;
 
@@ -106,7 +104,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)
@@ -185,7 +182,7 @@ int mutt_compose_attachment (BODY * a)
     }
   }
   else {
-    rfc1524_free_entry (&entry);
+    rfc1524_entry_delete(&entry);
     mutt_message (_("No mailcap compose entry for %s, creating empty file."),
                   type);
     return 1;
@@ -198,7 +195,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -216,7 +213,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;
 
@@ -227,8 +224,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;
@@ -259,7 +255,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;
   }
@@ -271,7 +267,7 @@ bailout:
   if (unlink_newfile)
     unlink (newfile);
 
-  rfc1524_free_entry (&entry);
+  rfc1524_entry_delete(&entry);
   return rc;
 }
 
@@ -339,7 +335,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);
@@ -409,11 +404,11 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   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;
@@ -592,7 +587,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)
@@ -899,9 +894,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))) {
@@ -909,7 +902,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);
@@ -933,14 +926,14 @@ 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);
+        rfc1524_entry_delete(&entry);
         safe_fclose (&ifp);
         return 0;
       }
@@ -960,7 +953,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);
   }
 
@@ -979,16 +972,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) {
@@ -997,8 +985,6 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         goto bail0;
       }
 
-      debug_print (2, ("Filter created.\n"));
-
       mutt_copy_stream (ifp, fpout);
 
       safe_fclose (&fpout);