drop str_[n]cat.

[apps/madmutt.git] / edit.c

diff --git a/edit.c b/edit.c
index 47f4480..37b46f2 100644 (file)
--- 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);
         }
@@ -436,10 +437,10 @@ 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");
+      m_strcat(tmp, sizeof(tmp), "\n");
       if (buflen == bufmax)
         p_realloc(&buf, bufmax += 25);
       buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);