#include "mbyte.h"
#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
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])
return (-1);
- str_replace (&menu->searchBuf, buf);
+ m_strreplace(&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
{
int i = OP_NULL;
- FOREVER {
+ for (;;) {
if (option (OPTMENUCALLER)) {
unset_option (OPTMENUCALLER);
return OP_NULL;
mutt_curs_set (0);
-
-#ifdef USE_IMAP
imap_keepalive ();
-#endif
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;