X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=1c928fa610794d3c895535ac3e1d38d4b2737a71;hp=f2ffa27d42d6dc5a93119ed3b0670b29883028ed;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/headers.c b/headers.c
index f2ffa27..1c928fa 100644
--- a/headers.c
+++ b/headers.c
@@ -11,10 +11,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
+#include "lib/debug.h"
+
 #include <sys/stat.h>
 #include <string.h>
 #include <ctype.h>
@@ -64,8 +69,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;
@@ -141,14 +145,14 @@ void mutt_edit_headers (const char *editor,
       SKIPWS (p);
       if (*p) {
         if ((q = strpbrk (p, " \t"))) {
-          mutt_substrcpy (path, p, q, sizeof (path));
+          str_substrcpy (path, p, q, sizeof (path));
           SKIPWS (q);
         }
         else
           strfcpy (path, p, sizeof (path));
         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;
         }