X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=ab95a2255b59fd2f0e1f4a98b186d376899560ab;hp=4e2c08ec347ba58b81dec63aec1a118c6f3033b4;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/sidebar.c b/sidebar.c
index 4e2c08e..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);
 
@@ -289,9 +289,9 @@ void sidebar_draw_frames (void) {
     move (i, SidebarWidth - delim_len);
     if (option (OPTASCIICHARS))
       addstr (NONULL (SidebarDelim));
-    else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
+    else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|"))
       addch (ACS_VLINE);
-    else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
+    else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|"))
       addstr ("\342\224\202");
     else
       addstr (NONULL (SidebarDelim));