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

diff --git a/sidebar.c b/sidebar.c
index 4e2c08e..deecda6 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -102,7 +102,7 @@ static const char* sidebar_number_format (char* dest, size_t destlen, char op,
   char tmp[SHORT_STRING];
   BUFFY* b = (BUFFY*) Incoming->data[data];
   int opt = flags & M_FORMAT_OPTIONAL;
-  int c = Context && str_eq (Context->path, b->path);
+  int c = Context && !m_strcmp(Context->path, b->path);
 
   switch (op) {
     /* deleted */
@@ -190,16 +190,14 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 {
   int shortened = 0, lencnt = 0;
   char no[SHORT_STRING], entry[SHORT_STRING];
-#if USE_IMAP
   int l = m_strlen(ImapHomeNamespace);
-#endif
   int l_m = m_strlen(Maildir);
 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
 
   if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path && 
-      !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
+      m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
     /* if $sidebar_newmail_only is set, don't display the
      * box only if it's not the currently opened
      * (i.e. always display the currently opened) */
@@ -210,13 +208,11 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   lencnt = m_strlen(no);
   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 +226,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 +285,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));