X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=5b70e5a0cd35e93c79f0eefdbb58a984316e6679;hp=6b5eeaed9a204523ebb1c71151c92121180a4c3a;hb=617e7d83d14e14e6a520a48e75437211b16c8834;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/rfc1524.c b/rfc1524.c
index 6b5eeae..5b70e5a 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -21,10 +21,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "ascii.h"
 #include "rfc1524.h"
+#include "attach.h"
 
-#include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
@@ -266,13 +269,13 @@ static int rfc1524_mailcap_parse (BODY * a,
           if (get_field_text (field + 4, &test_command, type, filename, line)
               && test_command) {
             len = str_len (test_command) + STRING;
-            safe_realloc (&test_command, len);
+            p_realloc(&test_command, len);
             rfc1524_expand_command (a, a->filename, type, test_command, len);
             if (mutt_system (test_command)) {
               /* a non-zero exit code means test failed */
               found = FALSE;
             }
-            FREE (&test_command);
+            p_delete(&test_command);
           }
         }
       }                         /* while (ch) */
@@ -297,13 +300,13 @@ static int rfc1524_mailcap_parse (BODY * a,
       if (!found) {
         /* reset */
         if (entry) {
-          FREE (&entry->command);
-          FREE (&entry->composecommand);
-          FREE (&entry->composetypecommand);
-          FREE (&entry->editcommand);
-          FREE (&entry->printcommand);
-          FREE (&entry->nametemplate);
-          FREE (&entry->convert);
+          p_delete(&entry->command);
+          p_delete(&entry->composecommand);
+          p_delete(&entry->composetypecommand);
+          p_delete(&entry->editcommand);
+          p_delete(&entry->printcommand);
+          p_delete(&entry->nametemplate);
+          p_delete(&entry->convert);
           entry->needsterminal = 0;
           entry->copiousoutput = 0;
         }
@@ -311,27 +314,27 @@ static int rfc1524_mailcap_parse (BODY * a,
     }                           /* while (!found && (buf = mutt_read_line ())) */
     fclose (fp);
   }                             /* if ((fp = fopen ())) */
-  FREE (&buf);
+  p_delete(&buf);
   return found;
 }
 
 rfc1524_entry *rfc1524_new_entry (void)
 {
-  return (rfc1524_entry *) safe_calloc (1, sizeof (rfc1524_entry));
+  return p_new(rfc1524_entry, 1);
 }
 
 void rfc1524_free_entry (rfc1524_entry ** entry)
 {
   rfc1524_entry *p = *entry;
 
-  FREE (&p->command);
-  FREE (&p->testcommand);
-  FREE (&p->composecommand);
-  FREE (&p->composetypecommand);
-  FREE (&p->editcommand);
-  FREE (&p->printcommand);
-  FREE (&p->nametemplate);
-  FREE (entry);
+  p_delete(&p->command);
+  p_delete(&p->testcommand);
+  p_delete(&p->composecommand);
+  p_delete(&p->composetypecommand);
+  p_delete(&p->editcommand);
+  p_delete(&p->printcommand);
+  p_delete(&p->nametemplate);
+  p_delete(entry);
 }
 
 /*
@@ -505,7 +508,7 @@ int rfc1524_expand_filename (char *nametemplate,
     }
   }
 
-  mutt_adv_mktemp (newfile, nflen);
+  mutt_adv_mktemp (NULL, newfile, nflen);
 
   if (rmatch && lmatch)
     return 0;