X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fstatus.c;h=9c4bdf9f882c382b142242f2ecfbe99bdeb2d5fe;hp=ffbdaeeaa53fbdc85aa849ab9dc617444d2c5c39;hb=b23d5033080fe9f9fba038e3cf1e3ec2b0a0d33d;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2

diff --git a/lib-ui/status.c b/lib-ui/status.c
index ffbdaee..9c4bdf9 100644
--- a/lib-ui/status.c
+++ b/lib-ui/status.c
@@ -46,11 +46,10 @@ static char *get_sort_str (char *buf, ssize_t buflen, int method)
  * %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;
@@ -275,24 +274,17 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op,
     return (src);
 
   default:
-    snprintf (buf, buflen, "%%%s%c", prefix, op);
+    *buf = 0;
     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);
 }