X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=8b9cb82361fc27c1dcccc30f1a7e8145e6c2dbda;hp=6c7a9aa93a241125c0733b4cf64be97715ea747f;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/attach.c b/attach.c
index 6c7a9aa..8b9cb82 100644
--- a/attach.c
+++ b/attach.c
@@ -13,10 +13,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
@@ -29,7 +31,6 @@
 #include "mx.h"
 #include "mutt_crypt.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -279,7 +280,7 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
-    if (str_cmp (p, "1") == 0)
+    if (m_strcmp(p, "1") == 0)
       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));
@@ -297,7 +298,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);
       }
@@ -315,7 +316,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) {
@@ -366,7 +367,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)
@@ -427,7 +428,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
@@ -435,7 +436,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 && str_cmp (tempfile, a->filename)) {
+      if (fp == NULL && m_strcmp(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)
@@ -566,18 +567,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
@@ -616,16 +617,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"));
@@ -754,8 +752,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);
@@ -808,7 +806,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)