X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=5480710bfb873ff386112972b685bb4577302d84;hp=913dbb7522fbf280c5f19936d3249acfa206c675;hb=9aae63e2d1cce39bb0928362416a8d17b953ca5e;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/attach.c b/attach.c
index 913dbb7..5480710 100644
--- a/attach.c
+++ b/attach.c
@@ -12,8 +12,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
@@ -26,9 +30,6 @@
 #include "mx.h"
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -144,12 +145,12 @@ int mutt_compose_attachment (BODY * a)
               b->parameter = NULL;
             }
             if (b->description) {
-              mem_free (&a->description);
+              p_delete(&a->description);
               a->description = b->description;
               b->description = NULL;
             }
             if (b->form_name) {
-              mem_free (&a->form_name);
+              p_delete(&a->form_name);
               a->form_name = b->form_name;
               b->form_name = NULL;
             }
@@ -296,7 +297,7 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = str_len (p);
+        lng = m_strlen(p);
         if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
           return (1);
       }
@@ -314,7 +315,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(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) {
@@ -335,9 +336,9 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
         debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)
-        mem_free (&tmp.subtype);
+        p_delete(&tmp.subtype);
       if (tmp.xtype)
-        mem_free (&tmp.xtype);
+        p_delete(&tmp.xtype);
     }
   }
 }
@@ -365,7 +366,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(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)
@@ -426,7 +427,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {
-      fname = str_dup (a->filename);
+      fname = m_strdup(a->filename);
       mutt_sanitize_filename (fname, 1);
     }
     else
@@ -452,7 +453,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 */
-      mem_free (&fname);
+      p_delete(&fname);
       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }
@@ -565,18 +566,18 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
   if (use_pager) {
     pager_t info;
+    p_clear(&info, 1);
 
-    memset (&info, 0, sizeof (info));
-    info.fp = fp;
+    info.fp  = fp;
     info.bdy = a;
     info.ctx = Context;
     info.idx = idx;
     info.idxlen = idxlen;
     info.hdr = hdr;
 
-    rc = mutt_do_pager (descrip, pagerfile,
-                        M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE :
-                                              0), &info);
+    rc = mutt_do_pager(descrip, pagerfile,
+                       M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+                       &info);
     *pagerfile = '\0';
   }
   else
@@ -615,16 +616,13 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
 
   if (fp) {
     /* recv case */
-
     STATE s;
-
-    memset (&s, 0, sizeof (STATE));
+    p_clear(&s, 1);
 
     if (outfile && *outfile)
-      thepid =
-        mutt_create_filter_fd (path, &s.fpout, NULL, NULL, -1, out, -1);
+      thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
     else
-      thepid = mutt_create_filter (path, &s.fpout, NULL, NULL);
+      thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
 
     if (thepid < 0) {
       mutt_perror (_("Can't create filter"));
@@ -753,8 +751,8 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
       /* In recv mode, extract from folder and decode */
 
       STATE s;
+      p_clear(&s, 1);
 
-      memset (&s, 0, sizeof (s));
       if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
         mutt_perror ("fopen");
         return (-1);
@@ -807,7 +805,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
   BODY *saved_parts = NULL;
   HEADER *saved_hdr = NULL;
 
-  memset (&s, 0, sizeof (s));
+  p_clear(&s, 1);
   s.flags = displaying;
 
   if (flags == M_SAVE_APPEND)