less horrible strncpy's

[apps/madmutt.git] / sidebar.c

diff --git a/sidebar.c b/sidebar.c
index da858b1..cd3db75 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -208,7 +208,7 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
                      sidebar_number_format, idx, M_FORMAT_OPTIONAL);
   lencnt = m_strlen(no);
-  memset (&entry, ' ', sizeof (entry));
+  memset(&entry, ' ', sizeof(entry));
 
 #if USE_IMAP
   if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 
@@ -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);
+  m_strcpy(entry + (len - lencnt), lencnt, no);
 
   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));
@@ -387,7 +387,7 @@ int sidebar_draw (int menu) {
   SETCOLOR (MT_COLOR_NORMAL);
 
   /* fill with blanks to bottom */
-  memset (&blank, ' ', sizeof (blank));
+  memset(&blank, ' ', sizeof(blank));
   for (; line < last_line; line++) {
     move (line, 0);
     addnstr (blank, SidebarWidth-delim_len);