X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=edit.c;h=02d18586e235835c6759d4c069dd0d28b9433bd6;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hp=e1bc6dfa29cc5dcc0770529f7157b8c375c1aefe;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd;p=apps%2Fmadmutt.git

diff --git a/edit.c b/edit.c
index e1bc6df..02d1858 100644
--- a/edit.c
+++ b/edit.c
@@ -14,11 +14,12 @@
 #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 "mutt.h"
-#include "ascii.h"
 #include "enter.h"
 #include "mutt_curses.h"
 #include "mutt_idna.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);
         }
@@ -436,7 +437,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
         break;
       }
     }
-    else if (str_cmp (".", tmp) == 0)
+    else if (m_strcmp(".", tmp) == 0)
       done = 1;
     else {
       str_cat (tmp, sizeof (tmp), "\n");