static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
{
if (menu->dialog) {
- strncpy (s, menu->dialog[i], l);
+ m_strcpy(s, l, menu->dialog[i]);
menu->current = -1; /* hide menubar */
}
else
char buf[SHORT_STRING];
if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
- strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (buf));
+ m_strcpy(buf, sizeof(buf), NONULL(menu->searchBuf));
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])