*/
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_menu.h"
#include "buffy.h"
#include "keymap.h"
-#include "lib/str.h"
-#include "lib/intl.h"
#include <libgen.h>
#include <ctype.h>
{
int dots = 0;
char *last_dot = NULL;
- int i, j, len = str_len (box);
+ int i, j, len = m_strlen(box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
- return (str_dup (box));
+ return (m_strdup(box));
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
if (strchr (SidebarBoundary, box[i])) {
new_box[j++] = box[i];
new_box[j] = 0;
- if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
+ if (&box[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
} else {
}
return new_box;
}
- return str_dup (box);
+ return m_strdup(box);
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
- int l = str_len (ImapHomeNamespace);
+ int l = m_strlen(ImapHomeNamespace);
#endif
- int l_m = str_len (Maildir);
+ int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt = str_len (no);
- memset (&entry, ' ', sizeof (entry));
+ lencnt = m_strlen(no);
+ memset(&entry, ' ', sizeof(entry));
#if USE_IMAP
if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
- str_len (box) > l)
+ 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 &&
- str_len (box) > l_m) {
+ m_strlen(box) > l_m) {
box += l_m;
if (Maildir[strlen(Maildir)-1]!='/') {
box += 1;
} else
box = basename (box);
- if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
+ if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) {
box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
snprintf (entry, len-lencnt, "%s", box);
- entry[str_len (entry)] = ' ';
+ entry[m_strlen(entry)] = ' ';
strncpy (entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (!option(OPTMBOXPANE) || SidebarWidth==0)
return;
- delim_len=str_len(NONULL(SidebarDelim));
+ delim_len=m_strlen(NONULL(SidebarDelim));
/* draw vertical delimiter */
SETCOLOR (MT_COLOR_SIDEBAR);
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 = str_len (SidebarDelim);
+ size_t delim_len = m_strlen(SidebarDelim);
char blank[SHORT_STRING];
known_lines=last_line-first_line;
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && str_len (SidebarDelim) >= SidebarWidth) {
+ && m_strlen(SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
SETCOLOR (MT_COLOR_NORMAL);
/* fill with blanks to bottom */
- memset (&blank, ' ', sizeof (blank));
+ memset(&blank, ' ', sizeof(blank));
for (; line < last_line; line++) {
move (line, 0);
addnstr (blank, SidebarWidth-delim_len);