X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=abd9b0f74d8a21b85bfbc1ec1290dab021e6de88;hp=e5a1540c57b7f00b0f15dd6f4f0787838492d6ea;hb=238b70e39b78f585c586bd51aef41988b3cc73d1;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed

diff --git a/headers.c b/headers.c
index e5a1540..abd9b0f 100644
--- a/headers.c
+++ b/headers.c
@@ -11,12 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <sys/stat.h>
@@ -130,7 +132,7 @@ void mutt_edit_headers (const char *editor,
       p = cur->data + 4;
       SKIPWS (p);
       if (*p) {
-        strfcpy (fcc, p, fcclen);
+        m_strcpy(fcc, fcclen, p);
         mutt_pretty_mailbox (fcc);
       }
       keep = 0;
@@ -148,10 +150,10 @@ void mutt_edit_headers (const char *editor,
           SKIPWS (q);
         }
         else
-          strfcpy (path, p, sizeof (path));
+          m_strcpy(path, sizeof(path), p);
         mutt_expand_path (path, sizeof (path));
         if ((body = mutt_make_file_attach (path))) {
-          body->description = str_dup (q);
+          body->description = m_strdup(q);
           for (parts = msg->content; parts->next; parts = parts->next);
           parts->next = body;
         }