#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "sidebar.h"
#include "buffy.h"
#include "keymap.h"
return m_strdup(box);
}
-static const char* sidebar_number_format (char* dest, size_t destlen, char op,
+static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
const char* src, const char* fmt,
const char* ifstr, const char* elstr,
unsigned long data, format_flag flags) {
char tmp[SHORT_STRING];
BUFFY* b = (BUFFY*) Incoming->data[data];
int opt = flags & M_FORMAT_OPTIONAL;
- int c = Context && str_eq (Context->path, b->path);
+ int c = Context && !m_strcmp(Context->path, b->path);
switch (op) {
/* deleted */
* 0 item was not printed ('cause of $sidebar_newmail_only)
* 1 item was printed
*/
-int make_sidebar_entry (char* box, int idx, size_t len)
+int make_sidebar_entry (char* box, int idx, ssize_t len)
{
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
-#if USE_IMAP
int l = m_strlen(ImapHomeNamespace);
-#endif
int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path &&
- !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
+ m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
/* if $sidebar_newmail_only is set, don't display the
* box only if it's not the currently opened
* (i.e. always display the currently opened) */
lencnt = m_strlen(no);
memset(&entry, ' ', sizeof(entry));
-#if USE_IMAP
- if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
+ if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 &&
m_strlen(box) > l)
box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
else
-#endif
- if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 &&
+ if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 &&
m_strlen(box) > l_m) {
box += l_m;
if (Maildir[strlen(Maildir)-1]!='/') {
shortened = 1;
}
- snprintf (entry, len-lencnt, "%s", box);
+ m_strcpy(entry, len - lencnt, box);
entry[m_strlen(entry)] = ' ';
- strncpy (entry + (len - lencnt), no, lencnt);
+ memcpy(entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
}
void sidebar_draw_frames (void) {
- size_t i,delim_len;
+ ssize_t i,delim_len;
if (!option(OPTMBOXPANE) || SidebarWidth==0)
return;
move (i, SidebarWidth - delim_len);
if (option (OPTASCIICHARS))
addstr (NONULL (SidebarDelim));
- else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
+ else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|"))
addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
+ else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|"))
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));
last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
i = 0,line;
BUFFY *tmp;
- size_t delim_len = m_strlen(SidebarDelim);
+ ssize_t delim_len = m_strlen(SidebarDelim);
char blank[SHORT_STRING];
known_lines=last_line-first_line;