less horrible strncpy's

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index aa4e4e3..01fde6c 100644 (file)
--- a/send.c
+++ b/send.c
@@ -15,6 +15,7 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -266,7 +267,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
       if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
         p = uh->data + 8;
         SKIPWS (p);
-        strncpy (buf, p, sizeof (buf));
+        m_strcpy(buf, sizeof(buf), p);
       }
     }
   }
@@ -1325,7 +1326,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (option (OPTSIGONTOP)
         && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && str_cmp (Editor, "builtin") != 0))
+            && m_strcmp(Editor, "builtin") != 0))
       append_signature (tempfp);
 
     /* include replies/forwarded messages, unless we are given a template */
@@ -1335,7 +1336,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (!option (OPTSIGONTOP)
         && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && str_cmp (Editor, "builtin") != 0))
+            && m_strcmp(Editor, "builtin") != 0))
       append_signature (tempfp);
 
     /* 
@@ -1449,7 +1450,7 @@ int ci_send_message (int flags, /* send mode */
       if (mutt_needs_mailcap (msg->content)) {
         if (!mutt_edit_attachment (msg->content))
           goto cleanup;
-      } else if (!Editor || str_cmp ("builtin", Editor) == 0)
+      } else if (!Editor || m_strcmp("builtin", Editor) == 0)
         mutt_builtin_editor (msg->content->filename, msg, cur);
       else if (option (OPTEDITHDRS)) {
         mutt_env_to_local (msg->env);
@@ -1701,7 +1702,7 @@ int ci_send_message (int flags, /* send mode */
     fcc[0] = '\0';
 #endif
 
-  if (*fcc && str_cmp ("/dev/null", fcc) != 0) {
+  if (*fcc && m_strcmp("/dev/null", fcc) != 0) {
     BODY *tmpbody = msg->content;
     BODY *save_sig = NULL;
     BODY *save_parts = NULL;
@@ -1712,8 +1713,8 @@ int ci_send_message (int flags, /* send mode */
     /* check to see if the user wants copies of all attachments */
     if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
       if (WithCrypto
-          && (str_cmp (msg->content->subtype, "encrypted") == 0 ||
-              str_cmp (msg->content->subtype, "signed") == 0)) {
+          && (m_strcmp(msg->content->subtype, "encrypted") == 0 ||
+              m_strcmp(msg->content->subtype, "signed") == 0)) {
         if (clear_content->type == TYPEMULTIPART) {
           if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
             /* save initial signature and attachments */