X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=ab95a2255b59fd2f0e1f4a98b186d376899560ab;hp=905a6da9b0879fbdaafae93b20d0666ecb937e24;hb=2a06362a155582cd59ae2ef6f0df71694a7eede3;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/sidebar.c b/sidebar.c
index 905a6da..ab95a22 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -211,12 +211,12 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   memset(&entry, ' ', sizeof(entry));
 
 #if USE_IMAP
-  if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 
+  if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 && 
       m_strlen(box) > l)
     box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
 #endif
-  if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 
+  if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 && 
       m_strlen(box) > l_m) {
     box += l_m;
     if (Maildir[strlen(Maildir)-1]!='/') {
@@ -230,9 +230,9 @@ int make_sidebar_entry (char* box, int idx, size_t len)
     shortened = 1;
   }
 
-  snprintf (entry, len-lencnt, "%s", box);
+  m_strcpy(entry, len - lencnt, box);
   entry[m_strlen(entry)] = ' ';
-  strncpy (entry + (len - lencnt), no, lencnt);
+  memcpy(entry + (len - lencnt), no, lencnt);
 
   addnstr (entry, len);