X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=2bc1bed04c995f5cf715f3c028fc2d25cbbcc9f9;hp=b47e2bd9398bfe5181a4abe98beb7fb02be6c421;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/hdrline.c b/hdrline.c
index b47e2bd..2bc1bed 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -11,24 +11,25 @@
 # include "config.h"
 #endif
 
-#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 <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
 
+#include <lib-lib/rx.h>
 #include <lib-lib/str.h>
 
 #include <lib-mime/mime.h>
 
-#include "lib/rx.h"
+#include <lib-ui/curses.h>
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
+#include "mutt.h"
+#include "alias.h"
+#include "sort.h"
+#include "thread.h"
+#include "charset.h"
+#include <lib-crypt/crypt.h>
+#include "mutt_idna.h"
 
 int mutt_is_mail_list (address_t * addr)
 {
@@ -79,7 +80,7 @@ static int check_for_mailing_list_addr (address_t * adr, char *buf, int buflen)
 }
 
 
-static int first_mailing_list (char *buf, size_t buflen, address_t * a)
+static int first_mailing_list (char *buf, ssize_t buflen, address_t * a)
 {
   for (; a; a = a->next) {
     if (mutt_is_subscribed_list (a)) {
@@ -90,7 +91,7 @@ static int first_mailing_list (char *buf, size_t buflen, address_t * a)
   return 0;
 }
 
-static void make_from (ENVELOPE * hdr, char *buf, size_t len, int do_lists)
+static void make_from (ENVELOPE * hdr, char *buf, ssize_t len, int do_lists)
 {
   int me;
 
@@ -113,7 +114,7 @@ static void make_from (ENVELOPE * hdr, char *buf, size_t len, int do_lists)
     *buf = 0;
 }
 
-static void make_from_addr (ENVELOPE * hdr, char *buf, size_t len,
+static void make_from_addr (ENVELOPE * hdr, char *buf, ssize_t len,
                             int do_lists)
 {
   int me;
@@ -220,7 +221,7 @@ struct hdr_format_info {
 };
 
 static const char *hdr_format_str (char *dest,
-                                   size_t destlen,
+                                   ssize_t destlen,
                                    char op,
                                    const char *src,
                                    const char *prefix,
@@ -239,7 +240,7 @@ static const char *hdr_format_str (char *dest,
 
 #define THREAD_NEW (threads && hdr->collapsed && hdr->num_hidden > 1 && mutt_thread_contains_unread (ctx, hdr) == 1)
 #define THREAD_OLD (threads && hdr->collapsed && hdr->num_hidden > 1 && mutt_thread_contains_unread (ctx, hdr) == 2)
-  size_t len;
+  ssize_t len;
 
   hdr = hfi->hdr;
   ctx = hfi->ctx;
@@ -646,7 +647,7 @@ static const char *hdr_format_str (char *dest,
       /* 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);
     }
@@ -656,35 +657,27 @@ static const char *hdr_format_str (char *dest,
 
     ch = ' ';
 
-    if (WithCrypto && hdr->security & GOODSIGN)
+    if (hdr->security & GOODSIGN)
       ch = 'S';
-    else if (WithCrypto && hdr->security & ENCRYPT)
+    else if (hdr->security & ENCRYPT)
       ch = 'P';
-    else if (WithCrypto && hdr->security & SIGN)
+    else if (hdr->security & SIGN)
       ch = 's';
-    else if ((WithCrypto & APPLICATION_PGP) && hdr->security & PGPKEY)
+    else if (hdr->security & PGPKEY)
       ch = 'K';
 
-    snprintf (buf2, sizeof (buf2),
-              "%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
-                                             ((hdr->read
-                                               && (ctx
-                                                   && ctx->msgnotreadyet !=
-                                                   hdr->msgno))
-                                              ? (hdr->
-                                                 replied ? 'r' : ' ') : (hdr->
-                                                                         old ?
-                                                                         'O' :
-                                                                         'N')))),
+    snprintf(buf2, sizeof (buf2), "%c%c%c",
+             (THREAD_NEW ? 'n'
+              : (THREAD_OLD
+                 ?  'o'
+                 : ((hdr->read && (ctx && ctx->msgnotreadyet != hdr->msgno))
+                    ? (hdr->replied ? 'r' : ' ')
+                    : (hdr->old ?  'O' : 'N')))),
               hdr->deleted ? 'D' : (hdr->attach_del ? 'd' : ch),
-              hdr->tagged ? '*' : (hdr->
-                                   flagged ? '!' : (Tochars
-                                                    &&
-                                                    ((i =
-                                                      mutt_user_is_recipient
-                                                      (hdr)) <
-                                                     m_strlen(Tochars)) ?
-                                                    Tochars[i] : ' ')));
+              hdr->tagged ? '*'
+              : (hdr->flagged ? '!'
+                 : (Tochars && ((i = mutt_user_is_recipient(hdr)) < m_strlen(Tochars))
+                    ?  Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
 
@@ -742,7 +735,7 @@ static const char *hdr_format_str (char *dest,
 }
 
 void
-_mutt_make_string (char *dest, size_t destlen, const char *s, CONTEXT * ctx,
+_mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
                    HEADER * hdr, format_flag flags)
 {
   struct hdr_format_info hfi;