X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=885c52855cee261ed6cad677d6a354060180a964;hp=99a8917fcc6574ee2c554cccbfab4688a9dc110c;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/recvattach.c b/recvattach.c
index 99a8917..885c528 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -16,6 +16,7 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -102,7 +103,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
     }
 
     if (idx[x]->tree) {
-      if (str_cmp (idx[x]->tree, buf) != 0)
+      if (m_strcmp(idx[x]->tree, buf) != 0)
         str_replace (&idx[x]->tree, buf);
     }
     else
@@ -408,8 +409,8 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
 
   if (body->filename) {
     if (directory && *directory)
-      mutt_concat_path (buf, *directory, mutt_basename (body->filename),
-                        sizeof (buf));
+      mutt_concat_path(buf, sizeof(buf), *directory,
+                       mutt_basename(body->filename));
     else
       strfcpy (buf, body->filename, sizeof (buf));
   }
@@ -994,7 +995,7 @@ void mutt_view_attachments (HEADER * hdr)
   attach_collapse (cur, 0, 1, 0);
   mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
 
-  FOREVER {
+  for (;;) {
     if (op == OP_NULL)
       op = mutt_menuLoop (menu);
     switch (op) {