X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=2a0ffa2f6c24a62fdbb02e845205d6dd14b3e1d1;hp=f4cf7cee46fae6cf0de5aa87ed5a6f1686199cfc;hb=00d4a666e4714da960fd0305fb52eb58fadcb2b6;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/remailer.c b/remailer.c
index f4cf7ce..2a0ffa2 100644
--- a/remailer.c
+++ b/remailer.c
@@ -16,14 +16,16 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 
 #include "remailer.h"
 
@@ -462,7 +464,7 @@ static struct mapping_t RemailerHelp[] = {
   {N_("Delete"), OP_MIX_DELETE},
   {N_("Abort"), OP_EXIT},
   {N_("OK"), OP_MIX_USE},
-  {NULL}
+  {NULL, OP_NULL}
 };
 
 
@@ -672,7 +674,7 @@ int mix_check_message (HEADER * msg)
 {
   const char *fqdn;
   short need_hostname = 0;
-  ADDRESS *p;
+  address_t *p;
 
   if (msg->env->cc || msg->env->bcc) {
     mutt_error _("Mixmaster doesn't accept Cc or Bcc headers.");
@@ -721,7 +723,7 @@ int mix_send_message (LIST * chain, const char *tempfile)
   snprintf (cmd, sizeof (cmd), "cat %s | %s -m ", tempfile, Mixmaster);
 
   for (i = 0; chain; chain = chain->next, i = 1) {
-    strfcpy (tmp, cmd, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), cmd);
     mutt_quote_filename (cd_quoted, sizeof (cd_quoted), (char *) chain->data);
     snprintf (cmd, sizeof (cmd), "%s%s%s", tmp, i ? "," : " -l ", cd_quoted);
   }