X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=2ba1266f8f93b22604a8d60e4fbca2d0442249cf;hp=d6135b30a992deb9a293e865c30875629cfcb032;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/hdrline.c b/hdrline.c
index d6135b3..2ba1266 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -14,11 +14,13 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "sort.h"
+#include "thread.h"
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
+#include "mime.h"
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
 #include "lib/rx.h"
 
 #include <ctype.h>
@@ -46,7 +48,7 @@ int mutt_is_subscribed_list (ADDRESS * addr)
  * return 1.  Otherwise, simply return 0.
  */
 static int
-check_for_mailing_list (ADDRESS * adr, char *pfx, char *buf, int buflen)
+check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -205,6 +207,7 @@ int mutt_user_is_recipient (HEADER * h)
  * %u = user (login) name of author
  * %v = first name of author, unless from self
  * %W = where user is (organization)
+ * %X = number of MIME attachments
  * %y = `x-label:' field (if present)
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
@@ -587,7 +590,7 @@ static const char *hdr_format_str (char *dest,
     snprintf (dest, destlen, fmt,
               (Tochars
                && ((i = mutt_user_is_recipient (hdr))) <
-               str_len (Tochars)) ? Tochars[i] : ' ');
+               m_strlen(Tochars)) ? Tochars[i] : ' ');
     break;
 
   case 'u':
@@ -628,6 +631,25 @@ static const char *hdr_format_str (char *dest,
       optional = 0;
     break;
 
+  case 'X':
+    {
+      int count = 0;
+
+      if (option (OPTCOUNTATTACH)) {
+        if (!hdr->content->parts)
+          mutt_parse_mime_message(ctx, hdr);
+        count = mutt_count_body_parts(hdr, 0);
+      }
+
+      /* The recursion allows messages without depth to return 0. */
+      if (optional)
+        optional = count != 0;
+      
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (dest, destlen, fmt, count);
+    }
+    break;
+
   case 'Z':
 
     ch = ' ';
@@ -659,7 +681,7 @@ static const char *hdr_format_str (char *dest,
                                                     ((i =
                                                       mutt_user_is_recipient
                                                       (hdr)) <
-                                                     str_len (Tochars)) ?
+                                                     m_strlen(Tochars)) ?
                                                     Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;