* %t = # of tagged messages [option]
* %v = Madmutt version
* %V = currently active limit pattern [option] */
-static const char *status_format_str (char *buf, ssize_t buflen, char op,
- const char *src, const char *prefix,
- const char *ifstr,
- const char *elstr,
- anytype data, format_flag flags)
+static const char *
+status_format_str(char *buf, ssize_t buflen, char op, const char *src,
+ const char *prefix, const char *ifstr, const char *elstr,
+ anytype data, format_flag flags)
{
char fmt[STRING], tmp[STRING];
const char *cp, *p;
case 'h':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (Hostname));
+ snprintf (buf, buflen, fmt, NONULL (MCore.shorthost));
break;
case 'f':
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version(0));
+ m_strcpy(buf, buflen, mutt_make_version());
break;
case 'V':
break;
}
- if (optional)
- menu_status_line (buf, buflen, menu, ifstr);
- else if (flags & M_FORMAT_OPTIONAL)
- menu_status_line (buf, buflen, menu, elstr);
+ if (flags & M_FORMAT_OPTIONAL)
+ menu_status_line(buf, buflen, menu, optional ? ifstr : elstr);
return (src);
}
-void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
- /*
- * if we have enough space for buffer, format lines to $COLS-$SidebarWidth
- * only to not wrap past end of screen
- */
- int width = COLS - SW;
- m_strformat(buf, (width >= len ? len : (width + 1)), p, status_format_str,
- menu, 0);
+void menu_status_line(char* buf, ssize_t len, MUTTMENU* menu, const char* p)
+{
+ m_strformat(buf, len, COLS - SW, p, status_format_str, menu, 0);
}