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

diff --git a/edit.c b/edit.c
index 37b46f2..d4bcc68 100644
--- a/edit.c
+++ b/edit.c
@@ -66,7 +66,7 @@ static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
 
   tmp[sizeof (tmp) - 1] = 0;
   if (prefix) {
-    strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), NONULL(Prefix));
     tmplen = m_strlen(tmp);
     p = tmp + tmplen;
     tmplen = sizeof (tmp) - tmplen;
@@ -247,7 +247,7 @@ static void be_edit_header (ENVELOPE * e, int force)
 
   if (!e->subject || force) {
     addstr ("Subject: ");
-    strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), NONULL(e->subject));
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
       str_replace (&e->subject, tmp);
     addch ('\n');
@@ -324,8 +324,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
       while (p >= tmp && ISSPACE (*p))
         *p-- = 0;
 
-      p = tmp + 2;
-      SKIPWS (p);
+      p = vskipspaces(tmp + 2);
 
       switch (tmp[1]) {
       case '?':
@@ -392,7 +391,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
       case 'u':
         if (buflen) {
           buflen--;
-          strfcpy (tmp, buf[buflen], sizeof (tmp));
+          m_strcpy(tmp, sizeof(tmp), buf[buflen]);
           tmp[m_strlen(tmp) - 1] = 0;
           p_delete(&buf[buflen]);
           buf[buflen] = NULL;