new_box[j++] = hbox[i + 1];
new_box[j] = 0;
} else {
- strcat (&new_box[j], last_dot);
+ m_strcat(&new_box[j], maxlen + 1, last_dot);
break;
}
}
return m_strdup(hbox);
}
-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 = Incoming.arr[data];
+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,
+ anytype data, format_flag flags)
+{
+ char tmp[STRING];
+ BUFFY* b = Incoming.arr[data.i];
int opt = flags & M_FORMAT_OPTIONAL;
int c = Context && !m_strcmp(Context->path, b->path);
break;
}
- if (opt)
- mutt_FormatString (dest, destlen, ifstr, sidebar_number_format,
- data, M_FORMAT_OPTIONAL);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elstr, sidebar_number_format,
- data, M_FORMAT_OPTIONAL);
- return (src);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, opt ? ifstr : elstr,
+ sidebar_number_format, data, flags);
+ return src;
}
int sidebar_need_count (void) {
static int make_sidebar_entry (char* sbox, int idx, ssize_t len)
{
int shortened = 0, lencnt = 0;
- char no[SHORT_STRING], entry[SHORT_STRING];
- int l = m_strlen(ImapHomeNamespace);
+ char no[STRING], entry[STRING];
int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
/* 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) */
- return (0);
+ return 0;
- mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
- sidebar_number_format, idx, M_FORMAT_OPTIONAL);
+ m_strformat(no, len, SidebarWidth, SidebarNumberFormat, sidebar_number_format, idx, 0);
lencnt = m_strlen(no);
- memset(&entry, ' ', sizeof(entry));
- if (l > 0 && m_strncmp(sbox, ImapHomeNamespace, l) == 0 &&
- m_strlen(sbox) > l)
- sbox += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
- else
if (l_m > 0 && m_strncmp(sbox, Maildir, l_m) == 0 &&
m_strlen(sbox) > l_m) {
sbox += l_m;
} else
sbox = basename (sbox);
- if (option (OPTSHORTENHIERARCHY) && m_strlen(sbox) > len-lencnt-1) {
+ if (option(OPTSHORTENHIERARCHY) && m_strlen(sbox) > len-lencnt-1) {
sbox = shortened_hierarchy (sbox, len-lencnt-1);
shortened = 1;
}
- m_strcpy(entry, len - lencnt, sbox);
- entry[m_strlen(entry)] = ' ';
- memcpy(entry + (len - lencnt), no, lencnt);
-
- addnstr (entry, len);
+ snprintf(entry, sizeof(entry), "%*s", (int)len, no);
+ memcpy(entry, sbox, MIN(len - 1, m_strlen(sbox)));
+ addnstr(entry, len);
if (shortened)
p_delete(&sbox);
- return (1);
+ return 1;
}
/* returns folder name of currently
i = 0,line;
BUFFY *tmp;
ssize_t delim_len = m_strlen(SidebarDelim);
- char blank[SHORT_STRING];
+ char blank[STRING];
known_lines=last_line-first_line;