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

diff --git a/curs_main.c b/curs_main.c
index 03315f2..18822d4 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -767,7 +767,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 +813,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 +822,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 +960,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 +1202,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) {
@@ -2196,7 +2196,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) {