#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "mbyte.h"
#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-#include "lib/str.h"
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
{
wchar_t wc;
size_t k;
- size_t n = str_len ((char *) s);
+ size_t n = m_strlen((char *) s);
mbstate_t mbstate;
- memset (&mbstate, 0, sizeof (mbstate));
+ p_clear(&mbstate, 1);
while (*s) {
if (*s < M_TREE_MAX) {
if (do_color)
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
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, str_len (s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, m_strlen(s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
p_delete(&tmpbuf);
mutt_error _("You are on the first entry.");
}
-static int default_color (int i)
+static int default_color (int i __attribute__ ((unused)))
{
return ColorDefs[MT_COLOR_NORMAL];
}
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;
menu->redraw = REDRAW_INDEX;
}
else if (menu->max) {
- int i = menu->tag (menu, menu->current, -1);
+ int t = menu->tag (menu, menu->current, -1);
- menu->tagged += i;
- if (i && option (OPTRESOLVE) && menu->current < menu->max - 1) {
+ menu->tagged += t;
+ if (t && option (OPTRESOLVE) && menu->current < menu->max - 1) {
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
}