- make shorten hierarchy feature more aggressive
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@299
e385b8ad-14ed-0310-8656-
cc95a2468c6d
-static char *shortened_hierarchy (char *box)
+static char *shortened_hierarchy (char *box, int maxlen)
{
int dots = 0;
char *last_dot = NULL;
{
int dots = 0;
char *last_dot = NULL;
+ int i, j, len = safe_strlen (box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
return (safe_strdup (box));
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
return (safe_strdup (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])) {
if (strchr (SidebarBoundary, box[i])) {
if (last_dot) {
++last_dot;
if (last_dot) {
++last_dot;
- new_box = safe_malloc (safe_strlen (last_dot) + 2 * dots + 1);
+ new_box = safe_malloc (maxlen + 1);
- 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 (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 + safe_strlen (last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
new_box[j++] = box[i + 1];
new_box[j] = 0;
strcat (&new_box[j], last_dot);
break;
}
strcat (&new_box[j], last_dot);
break;
}
box = basename (box);
if (option (OPTSHORTENHIERARCHY) && safe_strlen (box) > len-lencnt-1) {
box = basename (box);
if (option (OPTSHORTENHIERARCHY) && safe_strlen (box) > len-lencnt-1) {
- box = shortened_hierarchy (box);
+ box = shortened_hierarchy (box, len-lencnt-1);