exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / headers.c

diff --git a/headers.c b/headers.c
index 6134788..abd9b0f 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -11,11 +11,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
+#include "lib/debug.h"
 
 #include <sys/stat.h>
 #include <string.h>
@@ -66,8 +70,7 @@ void mutt_edit_headers (const char *editor,
   mutt_edit_file (editor, path);
   stat (path, &st);
   if (mtime == st.st_mtime) {
-    dprint (1,
-            (debugfile, "ci_edit_headers(): temp file was not modified.\n"));
+    debug_print (1, ("temp file was not modified.\n"));
     /* the file has not changed! */
     mutt_unlink (path);
     return;
@@ -129,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;
@@ -147,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 = safe_strdup (q);
+          body->description = m_strdup(q);
           for (parts = msg->content; parts->next; parts = parts->next);
           parts->next = body;
         }