if (list_empty(Incoming))
return;
+ if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+ CurBuffy = 0;
+ if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+ TopBuffy = 0;
/* correct known_lines if it has changed because of a window resize */
/* if (known_lines != LINES)
known_lines = LINES; */
-
+
lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
{
int dots = 0;
char *last_dot = NULL;
- int i, j, len = mutt_strlen (box);
+ int i, j, len = str_len (box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
- return (safe_strdup (box));
+ return (str_dup (box));
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
if (last_dot) {
++last_dot;
- new_box = safe_malloc (maxlen + 1);
+ new_box = mem_malloc (maxlen + 1);
new_box[0] = box[0];
for (i = 1, j = 1; j < maxlen && i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
new_box[j++] = box[i];
new_box[j] = 0;
- if (&box[i + 1] != last_dot || j + mutt_strlen (last_dot) > maxlen) {
+ if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
} else {
}
return new_box;
}
- return safe_strdup (box);
+ return str_dup (box);
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
break;
/* new */
case 'n':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->new : b->new);
+ } else if ((c && Context->new == 0) || (!c && b->new == 0))
+ opt = 0;
+ break;
+ /* unread */
+ case 'u':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, c ? Context->unread : b->msg_unread);
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
- int l = mutt_strlen (ImapHomeNamespace);
+ int l = str_len (ImapHomeNamespace);
#endif
+ int l_m = str_len (Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt = mutt_strlen (no);
+ lencnt = str_len (no);
memset (&entry, ' ', sizeof (entry));
#if USE_IMAP
- if (l > 0 && safe_strncmp (box, ImapHomeNamespace, l) == 0 &&
- mutt_strlen (box) > l)
- box += l + 1;
+ if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
+ str_len (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) {
+ box += l_m;
+ if (Maildir[strlen(Maildir)-1]!='/') {
+ box += 1;
+ }
+ } else
box = basename (box);
- if (option (OPTSHORTENHIERARCHY) && mutt_strlen (box) > len-lencnt-1) {
+ if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
snprintf (entry, len-lencnt, "%s", box);
- entry[mutt_strlen (entry)] = ' ';
+ entry[str_len (entry)] = ' ';
strncpy (entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (shortened)
- FREE(&box);
+ mem_free(&box);
return (1);
}
int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
BUFFY *tmp;
- short delim_len = mutt_strlen (SidebarDelim);
+ short delim_len = str_len (SidebarDelim);
char blank[SHORT_STRING];
/* initialize first time */
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && mutt_strlen (SidebarDelim) >= SidebarWidth) {
+ && str_len (SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
move (lines, SidebarWidth - delim_len);
if (option (OPTASCIICHARS))
addstr (NONULL (SidebarDelim));
- else if (!option (OPTASCIICHARS) && !mutt_strcmp (SidebarDelim, "|"))
+ else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !mutt_strcmp (SidebarDelim, "|"))
+ else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));