TopBuffy = 0;
}
-static char *shortened_hierarchy (char *box)
+static char *shortened_hierarchy (char *box, int maxlen)
{
int dots = 0;
char *last_dot = NULL;
- int i, j;
+ 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 < safe_strlen (box); ++i) {
- if (strchr (SidebarBoundary, box[i]))
- ++dots;
- }
- for (i = safe_strlen (box)-1; i >= 0; i--)
+ for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
+ ++dots;
last_dot = &box[i];
- break;
}
+ }
+
if (last_dot) {
++last_dot;
- new_box = safe_malloc (safe_strlen (last_dot) + 2 * dots + 1);
+ new_box = mem_malloc (maxlen + 1);
new_box[0] = box[0];
- for (i = 1, j = 1; i < safe_strlen (box); ++i) {
+ 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) {
+ if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
- }
- else {
+ } else {
strcat (&new_box[j], last_dot);
break;
}
}
return new_box;
}
- return safe_strdup (box);
+ return str_dup (box);
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
char tmp[SHORT_STRING];
BUFFY* b = (BUFFY*) Incoming->data[data];
int opt = flags & M_FORMAT_OPTIONAL;
- int c = Context && safe_strcmp (Context->path, b->path) == 0;
+ int c = Context && str_eq (Context->path, b->path);
switch (op) {
- case 'c':
- snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
- snprintf (dest, destlen, tmp, c ? Context->msgcount : b->msgcount);
+ /* deleted */
+ case 'd':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->deleted : 0);
+ } else if ((c && Context->deleted == 0) || !c)
+ opt = 0;
+ break;
+ /* flagged */
+ case 'F':
+ case 'f': /* for compatibility */
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->flagged : b->msg_flagged);
+ } else if ((c && Context->flagged == 0) || (!c && b->msg_flagged == 0))
+ opt = 0;
break;
+ /* total */
+ case 'c': /* for compatibility */
+ case 'm':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->msgcount : b->msgcount);
+ } else if ((c && Context->msgcount == 0) || (!c && b->msgcount == 0))
+ opt = 0;
+ break;
+ /* total shown, i.e. not hidden by limit */
+ case 'M':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->vcount : 0);
+ } else if ((c && Context->vcount == 0) || !c)
+ opt = 0;
+ break;
+ /* new */
case 'n':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
} else if ((c && Context->unread == 0) || (!c && b->msg_unread == 0))
opt = 0;
break;
- case 'f':
+ /* tagged */
+ case 't':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
- snprintf (dest, destlen, tmp, c ? Context->flagged : b->msg_flagged);
- } else if ((c && Context->flagged == 0) || (!c && b->msg_flagged == 0))
+ snprintf (dest, destlen, tmp, c ? Context->tagged : 0);
+ } else if ((c && Context->tagged == 0) || !c)
opt = 0;
break;
}
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
- int l = safe_strlen (ImapHomeNamespace);
+ int l = str_len (ImapHomeNamespace);
#endif
+ int l_m = str_len (Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path &&
- safe_strcmp (Context->path, box) != 0 &&
- ((BUFFY*) Incoming->data[idx])->new == 0)
+ !str_eq (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) */
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt = safe_strlen (no);
+ lencnt = str_len (no);
memset (&entry, ' ', sizeof (entry));
#if USE_IMAP
- if (l > 0 && safe_strncmp (box, ImapHomeNamespace, l) == 0 &&
- safe_strlen (box) > l)
+ if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
+ str_len (box) > l)
box += l + 1;
else
#endif
+ if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 &&
+ str_len (box) > l_m)
+ box += l_m + 1;
+ else
box = basename (box);
- if (option (OPTSHORTENHIERARCHY) && safe_strlen (box) > len-lencnt-1) {
- box = shortened_hierarchy (box);
+ 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[safe_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 = safe_strlen (SidebarDelim);
+ short delim_len = str_len (SidebarDelim);
char blank[SHORT_STRING];
/* initialize first time */
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && safe_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) && !safe_strcmp (SidebarDelim, "|"))
+ else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !safe_strcmp (SidebarDelim, "|"))
+ else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));
if (i == CurBuffy)
SETCOLOR (MT_COLOR_INDICATOR);
- else if (tmp->msg_flagged > 0)
- SETCOLOR (MT_COLOR_FLAGGED);
else if (tmp->new > 0)
SETCOLOR (MT_COLOR_NEW);
+ else if (tmp->msg_flagged > 0)
+ SETCOLOR (MT_COLOR_FLAGGED);
else
SETCOLOR (MT_COLOR_NORMAL);
projects / apps / madmutt.git / blobdiff