Rocco Rutte:

[apps/madmutt.git] / attach.c

diff --git a/attach.c b/attach.c
index 6976f6e..57d4bb3 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -19,7 +19,6 @@
 #include "rfc1524.h"
 #include "mime.h"
 #include "pager.h"
-#include "mailbox.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
@@ -60,14 +59,14 @@ int mutt_get_tmp_attachment (BODY * a)
 
   if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {      /* __FOPEN_CHECKED__ */
     mutt_copy_stream (fpin, fpout);
-    mutt_str_replace (&a->filename, tempfile);
+    str_replace (&a->filename, tempfile);
     a->unlink = 1;
 
     if (a->stamp >= st.st_mtime)
       mutt_stamp_attachment (a);
   }
   else
-    mutt_perror (fpin ? tempfile : a->filename);
+    mutt_perror(fpin ? tempfile : a->filename);
 
   if (fpin)
     fclose (fpin);
@@ -129,7 +128,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;
           }
@@ -157,7 +156,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;
             }
@@ -166,7 +165,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;
             }
@@ -274,7 +273,7 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
-    if (mutt_strcmp (p, "1") == 0)
+    if (safe_strcmp (p, "1") == 0)
       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));
@@ -292,8 +291,8 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = mutt_strlen (p);
-        if (buf[lng] == '/' && mutt_strncasecmp (buf, p, lng) == 0)
+        lng = safe_strlen (p);
+        if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0)
           return (1);
       }
 
@@ -310,7 +309,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
-    i = mutt_strlen (t->data) - 1;
+    i = safe_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) {
@@ -362,7 +361,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = mutt_strlen (t->data) - 1;
+    i = safe_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)
@@ -431,7 +430,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 && mutt_strcmp (tempfile, a->filename)) {
+      if (fp == NULL && safe_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)
@@ -624,7 +623,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;
     }
@@ -653,7 +652,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;
@@ -931,7 +930,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);
@@ -986,7 +985,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
       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;
       }