X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=edit.c;h=37b46f20cdf81bb7b638407cf086410bec51511c;hb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7;hp=4360c1fc9847e966037f8cb648e8837e22b7a6f6;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998;p=apps%2Fmadmutt.git

diff --git a/edit.c b/edit.c
index 4360c1f..37b46f2 100644
--- a/edit.c
+++ b/edit.c
@@ -17,6 +17,7 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -374,7 +375,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
         break;
       case 'r':
         if (*p) {
-          strncpy (tmp, p, sizeof (tmp));
+          m_strcpy(tmp, sizeof(tmp), p);
           mutt_expand_path (tmp, sizeof (tmp));
           buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
         }
@@ -439,7 +440,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
     else if (m_strcmp(".", tmp) == 0)
       done = 1;
     else {
-      str_cat (tmp, sizeof (tmp), "\n");
+      m_strcat(tmp, sizeof(tmp), "\n");
       if (buflen == bufmax)
         p_realloc(&buf, bufmax += 25);
       buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);