X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fsidebar.c;h=48e4360e594d786ec5ab18edfb066da2e7f21aae;hb=3242c00b2d3f7f1c1554bcebfb8a390fddea095f;hp=6668ca0b1005ef16771dda1cb08b902e1a13cb78;hpb=284454918cc95058b026d057195eaa5279135c36;p=apps%2Fmadmutt.git

diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index 6668ca0..48e4360 100644
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -82,7 +82,7 @@ static char *shortened_hierarchy (char *hbox, int maxlen)
           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;
         }
       }
@@ -96,7 +96,7 @@ 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];
+  char tmp[STRING];
   BUFFY* b = Incoming.arr[data];
   int opt = flags & M_FORMAT_OPTIONAL;
   int c = Context && !m_strcmp(Context->path, b->path);
@@ -163,10 +163,10 @@ static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
   }
 
   if (opt)
-    mutt_FormatString (dest, destlen, ifstr, sidebar_number_format,
+    m_strformat (dest, destlen, ifstr, sidebar_number_format,
                        data, M_FORMAT_OPTIONAL);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elstr, sidebar_number_format,
+    m_strformat (dest, destlen, elstr, sidebar_number_format,
                        data, M_FORMAT_OPTIONAL);
   return (src);
 }
@@ -186,7 +186,7 @@ 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];
+  char no[STRING], entry[STRING];
   int l = m_strlen(ImapHomeNamespace);
   int l_m = m_strlen(Maildir);
 
@@ -200,7 +200,7 @@ static int make_sidebar_entry (char* sbox, int idx, ssize_t len)
      * (i.e. always display the currently opened) */
     return (0);
 
-  mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
+  m_strformat (no, len, NONULL (SidebarNumberFormat),
                      sidebar_number_format, idx, M_FORMAT_OPTIONAL);
   lencnt = m_strlen(no);
   memset(&entry, ' ', sizeof(entry));
@@ -322,7 +322,7 @@ int sidebar_draw (void) {
       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;