X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=90e2bdca18e373c18990f276e241693d08f6bc0f;hp=52547deba533aaf4df440d1f26a0df79059d365d;hb=186cc3cb513f2387959888d896dbf67b250a9035;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/menu.c b/menu.c
index 52547de..90e2bdc 100644
--- a/menu.c
+++ b/menu.c
@@ -22,10 +22,7 @@
 #include "mbyte.h"
 #include "sidebar.h"
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
+#include <imap/imap.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -140,7 +137,7 @@ static void print_enriched_string (int attr, unsigned char *s, int 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
@@ -628,7 +625,7 @@ void menu_prev_entry (MUTTMENU * menu)
     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];
 }
@@ -682,12 +679,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 {
@@ -800,7 +797,7 @@ int mutt_menuLoop (MUTTMENU * menu)
 {
   int i = OP_NULL;
 
-  FOREVER {
+  for (;;) {
     if (option (OPTMENUCALLER)) {
       unset_option (OPTMENUCALLER);
       return OP_NULL;
@@ -808,10 +805,7 @@ int mutt_menuLoop (MUTTMENU * menu)
 
 
     mutt_curs_set (0);
-
-#ifdef USE_IMAP
     imap_keepalive ();
-#endif
 
     if (menu_redraw (menu) == OP_REDRAW)
       return OP_REDRAW;
@@ -976,10 +970,10 @@ int mutt_menuLoop (MUTTMENU * menu)
           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;
           }