# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "mx.h"
#include "buffy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <string.h>
#include <ctype.h>
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p;
+ char fmt[SHORT_STRING], tmp[SHORT_STRING];
+ const char *cp, *p;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
if (!StChars)
buf[0] = 0;
- else if (i >= str_len (StChars))
+ else if (i >= m_strlen(StChars))
buf[0] = StChars[0];
else
buf[0] = StChars[i];
* if we have enough space for buffer, format lines to $COLS-$SidebarWidth
* only to not wrap past end of screen
*/
- mutt_FormatString (buf, (COLS-SW)>len?len:(COLS-SW), p, status_format_str,
+ int width = COLS - SW;
+ mutt_FormatString (buf, (width >= len ? len : (width + 1)),
+ p, status_format_str,
(unsigned long) menu, 0);
}