X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=47abf57180bcfb90ba4e7a93aa0929725327a82c;hp=f95eb326f16dbfc1d5ae6eabeb6890700288ccd5;hb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/status.c b/status.c
index f95eb32..47abf57 100644
--- a/status.c
+++ b/status.c
@@ -12,18 +12,17 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "sort.h"
-#include "mapping.h"
 #include "mx.h"
 #include "buffy.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -82,23 +81,21 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
   case 'B':
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
     if (Context && Context->compressinfo && Context->realpath) {
       if ((p = strrchr (Context->realpath, '/')))
-        strfcpy (tmp, p + 1, sizeof (tmp));
+        m_strcpy(tmp, sizeof(tmp), p + 1);
       else
-        strfcpy (tmp, Context->realpath, sizeof (tmp));
+        m_strcpy(tmp, sizeof(tmp), Context->realpath);
     }
     else
-#endif
     if (Context && Context->path) {
       if ((p = strrchr (Context->path, '/')))
-        strfcpy (tmp, p + 1, sizeof (tmp));
+        m_strcpy(tmp, sizeof(tmp), p + 1);
       else
-        strfcpy (tmp, Context->path, sizeof (tmp));
+        m_strcpy(tmp, sizeof(tmp), Context->path);
     }
     else
-      strfcpy (tmp, _("no mailbox"), sizeof (tmp));
+      m_strcpy(tmp, sizeof(tmp), _("no mailbox"));
     snprintf (buf, buflen, fmt, tmp);
     break;
 
@@ -118,19 +115,17 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
   case 'f':
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
     if (Context && Context->compressinfo && Context->realpath) {
-      strfcpy (tmp, Context->realpath, sizeof (tmp));
+      m_strcpy(tmp, sizeof(tmp), Context->realpath);
       mutt_pretty_mailbox (tmp);
     }
     else
-#endif
     if (Context && Context->path) {
-      strfcpy (tmp, Context->path, sizeof (tmp));
+      m_strcpy(tmp, sizeof(tmp), Context->path);
       mutt_pretty_mailbox (tmp);
     }
     else
-      strfcpy (tmp, _("(no mailbox)"), sizeof (tmp));
+      m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
     snprintf (buf, buflen, fmt, tmp);
     break;
 
@@ -246,7 +241,7 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
       if (!StChars)
         buf[0] = 0;
-      else if (i >= str_len (StChars))
+      else if (i >= m_strlen(StChars))
         buf[0] = StChars[0];
       else
         buf[0] = StChars[i];
@@ -284,7 +279,7 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
     break;
 
   case 'v':
-    strncpy (buf, mutt_make_version (0), buflen);
+    m_strcpy(buf, buflen, mutt_make_version(0));
     break;
 
   case 'V':