X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=36ed33ac51f0b04b31a5237f0ed92e51a89e166d;hp=03315f2652885baa810a218e98bb7a8e2eba87ea;hb=2b2f17c2b838911949a6e8665ef3131382099a62;hpb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e

diff --git a/curs_main.c b/curs_main.c
index 03315f2..36ed33a 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -17,12 +17,12 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
@@ -113,7 +113,6 @@ static const char *No_visible = N_("No visible messages.");
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-extern const char *ReleaseDate;
 extern size_t UngetCount;
 
 void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
@@ -767,7 +766,7 @@ int mutt_index_menu (void)
 
             break;
           }
-          strfcpy (buf, ref->data, sizeof (buf));
+          m_strcpy(buf, sizeof(buf), ref->data);
         }
         if (!Context->id_hash)
           Context->id_hash = mutt_make_id_hash (Context);
@@ -813,7 +812,7 @@ int mutt_index_menu (void)
 
         if (!Context->id_hash)
           Context->id_hash = mutt_make_id_hash (Context);
-        strfcpy (buf, CURHDR->env->message_id, sizeof (buf));
+        m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
 
         if (op == OP_RECONSTRUCT_THREAD) {
           LIST *ref = CURHDR->env->references;
@@ -822,7 +821,7 @@ int mutt_index_menu (void)
             nntp_check_msgid (Context, ref->data);
             /* the last msgid in References is the root message */
             if (!ref->next)
-              strfcpy (buf, ref->data, sizeof (buf));
+              m_strcpy(buf, sizeof(buf), ref->data);
             ref = ref->next;
           }
         }
@@ -960,7 +959,7 @@ int mutt_index_menu (void)
           set_option (OPTHIDEREAD);
         }
         else {
-          strfcpy (buf, Context->pattern + 8, sizeof (buf));
+          m_strcpy(buf, sizeof(buf), Context->pattern + 8);
           if (!*buf || strncmp (buf, ".*", 2) == 0)
             snprintf (buf, sizeof (buf), "~A");
           unset_option (OPTHIDEREAD);
@@ -1202,13 +1201,13 @@ int mutt_index_menu (void)
 #endif
       {
         if (Context && Context->path)
-          strncpy (buf, Context->path, sizeof (buf));
+          m_strcpy(buf, sizeof(buf), Context->path);
         if (op != OP_SIDEBAR_OPEN)
           buffy_next (buf, sizeof (buf));
       }
 
       if (op == OP_SIDEBAR_OPEN) {
-        strncpy (buf, NONULL(sidebar_get_current ()), sizeof (buf));
+        m_strcpy(buf, sizeof(buf), sidebar_get_current());
       }
       else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) {
         if (menu->menu == MENU_PAGER) {
@@ -1234,18 +1233,18 @@ int mutt_index_menu (void)
         mutt_error (_("%s is not a mailbox."), buf);
         break;
       }
-      str_replace (&CurrentFolder, buf);
+      m_strreplace(&CurrentFolder, buf);
 
       if (Context) {
         int check;
 
 #ifdef USE_COMPRESSED
         if (Context->compressinfo && Context->realpath)
-          str_replace (&LastFolder, Context->realpath);
+          m_strreplace(&LastFolder, Context->realpath);
         else
 #endif
 
-          str_replace (&LastFolder, Context->path);
+          m_strreplace(&LastFolder, Context->path);
         oldcount = Context ? Context->msgcount : 0;
 
         if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
@@ -2196,7 +2195,7 @@ int mutt_index_menu (void)
         sleep (2);
       }
       else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
-               str_casecmp (CURHDR->env->followup_to, "poster") ||
+               m_strcasecmp(CURHDR->env->followup_to, "poster") ||
                query_quadoption (OPT_FOLLOWUPTOPOSTER,
                                  _("Reply by mail as poster prefers?")) !=
                M_YES) {