exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index cbefd24..ffa19a3 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -18,6 +18,7 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "recvattach.h"
@@ -436,7 +437,7 @@ static int mix_chain_add (MIXCHAIN * chain, const char *s,
   if (chain->cl >= MAXMIXES)
     return -1;
 
-  if (!str_cmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
+  if (!m_strcmp(s, "0") || !ascii_strcasecmp (s, "<random>")) {
     chain->ch[chain->cl++] = 0;
     return 0;
   }
@@ -721,7 +722,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);
   }