X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a0eb9acd6b3f028a12761e570bc55d7b5fae81ef;hp=b46050ecd35b7061747e61dd20fa8d45c852c6d7;hb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/compose.c b/compose.c
index b46050e..a0eb9ac 100644
--- a/compose.c
+++ b/compose.c
@@ -16,6 +16,9 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -41,8 +44,6 @@
 #include "nntp.h"
 #endif
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <errno.h>
 #include <string.h>
@@ -223,14 +224,14 @@ static void redraw_mix_line (LIST * chain)
     if (t && t[0] == '0' && t[1] == '\0')
       t = "<random>";
 
-    if (c + str_len (t) + 2 >= COLS - SW)
+    if (c + m_strlen(t) + 2 >= COLS - SW)
       break;
 
     addstr (NONULL (t));
     if (chain->next)
       addstr (", ");
 
-    c += str_len (t) + 2;
+    c += m_strlen(t) + 2;
   }
 }
 #endif /* MIXMASTER */
@@ -479,7 +480,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op,
     break;
 
   case 'v':
-    strncpy (buf, mutt_make_version (0), buflen);
+    m_strcpy(buf, buflen, mutt_make_version (0));
     break;
 
   case 0:
@@ -621,7 +622,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->newsgroups);
           str_skip_trailws (buf);
-          msg->env->newsgroups = str_dup (str_skip_initws (buf));
+          msg->env->newsgroups = m_strdup(str_skip_initws (buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -639,7 +640,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->followup_to);
           str_skip_trailws (buf);
-          msg->env->followup_to = str_dup (str_skip_initws (buf));
+          msg->env->followup_to = m_strdup(str_skip_initws (buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)
@@ -656,7 +657,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
           p_delete(&msg->env->x_comment_to);
-          msg->env->x_comment_to = str_dup (buf);
+          msg->env->x_comment_to = m_strdup(buf);
           move (HDR_BCC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->x_comment_to)
@@ -696,7 +697,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
     case OP_COMPOSE_EDIT_MESSAGE:
-      if (Editor && (str_cmp ("builtin", Editor) != 0)
+      if (Editor && (m_strcmp("builtin", Editor) != 0)
           && !option (OPTEDITHDRS)) {
         mutt_edit_file (Editor, msg->content->filename);
         mutt_update_encoding (msg->content);
@@ -706,10 +707,11 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       /* fall through */
     case OP_COMPOSE_EDIT_HEADERS:
-      if (str_cmp ("builtin", Editor) != 0 &&
+      if (m_strcmp("builtin", Editor) != 0 &&
           (op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
-        const char *tag = NULL, *err = NULL;
+        const char *tag = NULL;
+        char *err = NULL;
 
         mutt_env_to_local (msg->env);
         mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,