X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=4129fda38e6231eb9208430e3e4d20fa66abc339;hp=3a9dd146a4f2913a95e4b01ffda732d1e240245a;hb=24a996896edb7b7fc8f5fd5950a07c4a52a42d05;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/handler.c b/handler.c
index 3a9dd14..4129fda 100644
--- a/handler.c
+++ b/handler.c
@@ -26,21 +26,21 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "state.h"
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/debug.h"
 
 typedef int handler_f (BODY *, STATE *);
 typedef handler_f *handler_t;
@@ -49,7 +49,7 @@ static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
 {
   int c, ch;
   char bufi[BUFI_SIZE];
-  size_t l = 0;
+  ssize_t l = 0;
 
   if (istext) {
     state_set_prefix (s);
@@ -96,7 +96,7 @@ static int qp_decode_triple (char *s, char *d)
   return -1;
 }
 
-static void qp_decode_line (char *dest, char *src, size_t * l, int last)
+static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
 {
   char *d, *s;
   char c;
@@ -157,9 +157,9 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
 {
   char line[STRING];
   char decline[2 * STRING];
-  size_t l = 0;
-  size_t linelen;               /* number of input bytes in `line' */
-  size_t l3;
+  ssize_t l = 0;
+  ssize_t linelen;               /* number of input bytes in `line' */
+  ssize_t l3;
 
   int last;                     /* store the last character in the input line */
 
@@ -210,7 +210,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
   char buf[5];
   int c1, c2, c3, c4, ch, cr = 0, i;
   char bufi[BUFI_SIZE];
-  size_t l = 0;
+  ssize_t l = 0;
 
   buf[4] = 0;
 
@@ -225,7 +225,6 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
         buf[i++] = ch;
     }
     if (i != 4) {
-      debug_print (2, ("didn't get a multiple of 4 chars.\n"));
       break;
     }
 
@@ -298,7 +297,7 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
   char linelen, c, l, out;
   char *pt;
   char bufi[BUFI_SIZE];
-  size_t k = 0;
+  ssize_t k = 0;
 
   if (istext)
     state_set_prefix (s);
@@ -377,15 +376,15 @@ struct enriched_state {
   char *buffer;
   char *line;
   char *param;
-  size_t buff_len;
-  size_t line_len;
-  size_t line_used;
-  size_t line_max;
-  size_t indent_len;
-  size_t word_len;
-  size_t buff_used;
-  size_t param_used;
-  size_t param_len;
+  ssize_t buff_len;
+  ssize_t line_len;
+  ssize_t line_used;
+  ssize_t line_max;
+  ssize_t indent_len;
+  ssize_t word_len;
+  ssize_t buff_used;
+  ssize_t param_used;
+  ssize_t param_len;
   int tag_level[RICH_LAST_TAG];
   int WrapMargin;
   STATE *s;
@@ -399,7 +398,7 @@ static void enriched_wrap (struct enriched_state *stte)
   if (stte->line_len) {
     if (stte->tag_level[RICH_CENTER] || stte->tag_level[RICH_FLUSHRIGHT]) {
       /* Strip trailing white space */
-      size_t y = stte->line_used - 1;
+      ssize_t y = stte->line_used - 1;
 
       while (y && ISSPACE (stte->line[y])) {
         stte->line[y] = '\0';
@@ -414,7 +413,7 @@ static void enriched_wrap (struct enriched_state *stte)
         while (stte->line[y] && ISSPACE (stte->line[y]))
           y++;
         if (y) {
-          size_t z;
+          ssize_t z;
 
           for (z = y; z <= stte->line_used; z++) {
             stte->line[z - y] = stte->line[z];
@@ -771,7 +770,7 @@ static int alternative_handler (BODY * a, STATE * s)
 {
   BODY *choice = NULL;
   BODY *b;
-  LIST *t;
+  string_list_t *t;
   char buf[STRING];
   int type = 0;
   int mustfree = 0;
@@ -968,11 +967,9 @@ int mutt_can_decode (BODY * a)
   else if (a->type == TYPEMULTIPART) {
     BODY *p;
 
-    if (WithCrypto) {
-      if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
-          ascii_strcasecmp (a->subtype, "encrypted") == 0)
-        return (1);
-    }
+    if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
+        ascii_strcasecmp (a->subtype, "encrypted") == 0)
+      return (1);
 
     for (p = a->parts; p; p = p->next) {
       if (mutt_can_decode (p))
@@ -980,10 +977,10 @@ int mutt_can_decode (BODY * a)
     }
 
   }
-  else if (WithCrypto && a->type == TYPEAPPLICATION) {
-    if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (a))
+  else if (a->type == TYPEAPPLICATION) {
+    if (mutt_is_application_pgp(a))
       return (1);
-    if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (a))
+    if (mutt_is_application_smime (a))
       return (1);
   }
 
@@ -1285,24 +1282,20 @@ void mutt_decode_attachment (BODY * b, STATE * s)
   fseeko (s->fpin, b->offset, 0);
   switch (b->encoding) {
   case ENCQUOTEDPRINTABLE:
-    mutt_decode_quoted (s, b->length, istext ||
-                        ((WithCrypto & APPLICATION_PGP) &&
-                         mutt_is_application_pgp (b)), cd);
+    mutt_decode_quoted(s, b->length,
+                       istext || mutt_is_application_pgp(b), cd);
     break;
   case ENCBASE64:
-    mutt_decode_base64 (s, b->length, istext ||
-                        ((WithCrypto & APPLICATION_PGP) &&
-                         mutt_is_application_pgp (b)), cd);
+    mutt_decode_base64(s, b->length,
+                       istext || mutt_is_application_pgp(b), cd);
     break;
   case ENCUUENCODED:
-    mutt_decode_uuencoded (s, b->length, istext
-                           || ((WithCrypto & APPLICATION_PGP) &&
-                               mutt_is_application_pgp (b)), cd);
+    mutt_decode_uuencoded(s, b->length,
+                          istext || mutt_is_application_pgp(b), cd);
     break;
   default:
-    mutt_decode_xbit (s, b->length, istext
-                      || ((WithCrypto & APPLICATION_PGP) &&
-                          mutt_is_application_pgp (b)), cd);
+    mutt_decode_xbit(s, b->length,
+                     istext || mutt_is_application_pgp(b), cd);
     break;
   }
 
@@ -1318,7 +1311,7 @@ int mutt_body_handler (BODY * b, STATE * s)
   char tempfile[_POSIX_PATH_MAX];
   handler_t handler = NULL;
   long tmpoffset = 0;
-  size_t tmplength = 0;
+  ssize_t tmplength = 0;
   char type[STRING];
   int rc = 0;
 
@@ -1341,7 +1334,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       /* avoid copying this part twice since removing the transfer-encoding is
        * the only operation needed.
        */
-      if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+      if (mutt_is_application_pgp (b))
         handler = crypt_pgp_application_pgp_handler;
       else
         if (ascii_strcasecmp
@@ -1368,7 +1361,7 @@ int mutt_body_handler (BODY * b, STATE * s)
 
     if (ascii_strcasecmp ("alternative", b->subtype) == 0)
       handler = alternative_handler;
-    else if (WithCrypto && ascii_strcasecmp ("signed", b->subtype) == 0) {
+    else if (ascii_strcasecmp ("signed", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)
@@ -1377,8 +1370,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       else if (s->flags & M_VERIFY)
         handler = mutt_signed_handler;
     }
-    else if ((WithCrypto & APPLICATION_PGP)
-             && m_strcasecmp("encrypted", b->subtype) == 0) {
+    else if (m_strcasecmp("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)
@@ -1392,10 +1384,10 @@ int mutt_body_handler (BODY * b, STATE * s)
     if (!handler)
       handler = multipart_handler;
   }
-  else if (WithCrypto && b->type == TYPEAPPLICATION) {
-    if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+  else if (b->type == TYPEAPPLICATION) {
+    if (mutt_is_application_pgp (b))
       handler = crypt_pgp_application_pgp_handler;
-    if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (b))
+    if (mutt_is_application_smime (b))
       handler = crypt_smime_application_smime_handler;
   }