exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index ad57de7..78b75ca 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1471,7 +1471,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   mutt_compile_help (helpstr, sizeof (helpstr), MENU_PAGER, PagerHelp);
   if (IsHeader (extra)) {
 
   mutt_compile_help (helpstr, sizeof (helpstr), MENU_PAGER, PagerHelp);
   if (IsHeader (extra)) {

-    strfcpy (tmphelp, helpstr, sizeof (tmphelp));
+    m_strcpy(tmphelp, sizeof(tmphelp), helpstr);

     mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER,
 #ifdef USE_NNTP
                        (Context
     mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER,
 #ifdef USE_NNTP
                        (Context


@@ -1481,7 +1481,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }
   if (!InHelp) {
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }
   if (!InHelp) {

-    strfcpy (tmphelp, helpstr, sizeof (tmphelp));
+    m_strcpy(tmphelp, sizeof(tmphelp), helpstr);

     mutt_make_help (buffer, sizeof (buffer), _("Help"), MENU_PAGER, OP_HELP);
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }
     mutt_make_help (buffer, sizeof (buffer), _("Help"), MENU_PAGER, OP_HELP);
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }


@@ -1889,7 +1889,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
     case OP_SEARCH:
     case OP_SEARCH_REVERSE:
 
     case OP_SEARCH:
     case OP_SEARCH_REVERSE:

-      strfcpy (buffer, searchbuf, sizeof (buffer));
+      m_strcpy(buffer, sizeof(buffer), searchbuf);

       if (mutt_get_field ((SearchBack ? _("Reverse search: ") :
                            _("Search: ")), buffer, sizeof (buffer),
                           M_CLEAR) != 0)
       if (mutt_get_field ((SearchBack ? _("Reverse search: ") :
                            _("Search: ")), buffer, sizeof (buffer),
                           M_CLEAR) != 0)


@@ -1910,7 +1910,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       if (!buffer[0])
         break;
 
       if (!buffer[0])
         break;
 

-      strfcpy (searchbuf, buffer, sizeof (searchbuf));
+      m_strcpy(searchbuf, sizeof(searchbuf), buffer);

 
       /* leave SearchBack alone if ch == OP_SEARCH_NEXT */
       if (ch == OP_SEARCH)
 
       /* leave SearchBack alone if ch == OP_SEARCH_NEXT */
       if (ch == OP_SEARCH)