X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=05b6b11609999e5927adc72aedb4036eed45343e;hp=42f411cb720566c965af9b5e238a8f483f1ca53d;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=c6b9d35ed9361e4defab9762a7480d5126405ae9

diff --git a/menu.c b/menu.c
index 42f411c..05b6b11 100644
--- a/menu.c
+++ b/menu.c
@@ -682,12 +682,12 @@ static int menu_search (MUTTMENU * menu, int op)
   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])
       return (-1);
-    str_replace (&menu->searchBuf, buf);
+    m_strreplace(&menu->searchBuf, buf);
     menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
   }
   else {