X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=6c613eb64343dc55a002e91bb097ff6ae91c46d0;hp=cc3d0d381e725f6754d5929c41427ce166e29708;hb=5ed593da25809636fe4266e212d8d382a738649b;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/status.c b/status.c
index cc3d0d3..6c613eb 100644
--- a/status.c
+++ b/status.c
@@ -12,17 +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/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -81,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;
 
@@ -117,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;
 
@@ -226,26 +222,16 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
       int i = 0;
 
       if (Context) {
-        i = option (OPTATTACHMSG) ? 3 : ((Context->readonly ||
-                                          Context->dontwrite) ? 2 : (Context->
-                                                                     changed
-                                                                     || (
-#ifdef USE_IMAP
-                                                                             /* deleted doesn't necessarily mean changed in IMAP */
-                                                                             Context->
-                                                                             magic
-                                                                             !=
-                                                                             M_IMAP
-                                                                             &&
-#endif
-                                                                             Context->
-                                                                             deleted))
-                                         ? 1 : 0);
+        /* XXX: deleted doesn't necessarily mean changed in IMAP */
+        i = option (OPTATTACHMSG) ? 3
+            : ((Context->readonly || Context->dontwrite) ? 2
+               : (Context->changed || (Context-> magic != M_IMAP && Context->
+                                        deleted)) ? 1 : 0);
       }
 
       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];
@@ -283,7 +269,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':