Update to latest madtty.

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 11ff8a2..f75fab1 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -139,8 +139,8 @@ static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
 
 static void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
 {
-  char line[STRING];
-  char decline[2 * STRING];
+  char line[10 * STRING];
+  char decline[20 * STRING];
   ssize_t l = 0;
   ssize_t linelen;               /* number of input bytes in `line' */
   ssize_t l3;
@@ -182,6 +182,7 @@ static void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
     /* decode and do character set conversion */
     qp_decode_line (decline + l, line, &l3, last);
     l += l3;
+    assert (l < sizeof(decline));
     mutt_convert_to_state (cd, decline, &l, s);
   }
 
@@ -659,7 +660,7 @@ static int text_enriched_handler (BODY * a, STATE * s)
   p_delete(&(stte.line));
   p_delete(&(stte.param));
 
-  return (0);
+  return 0;
 }
 
 #define TXTHTML     1
@@ -815,7 +816,7 @@ static int alternative_handler (BODY * a, STATE * s)
   if (mustfree)
     body_list_wipe(&a);
 
-  return (rc);
+  return rc;
 }
 
 /* handles message/rfc822 body parts */
@@ -856,7 +857,7 @@ static int message_handler (BODY * a, STATE * s)
       a->encoding == ENCUUENCODED)
     body_list_wipe(&b);
 
-  return (rc);
+  return rc;
 }
 
 /* returns 1 if decoding the attachment will produce output */
@@ -866,11 +867,11 @@ int mutt_can_decode (BODY * a)
 
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (mutt_is_autoview (a, type))
-    return (rfc1524_mailcap_lookup (a, type, NULL, M_AUTOVIEW));
+    return rfc1524_mailcap_lookup (a, type, NULL, M_AUTOVIEW);
   else if (a->type == TYPETEXT)
-    return (1);
+    return 1;
   else if (a->type == TYPEMESSAGE)
-    return (1);
+    return 1;
   else if (a->type == TYPEMULTIPART) {
     BODY *p;
     int tok = mime_which_token(a->subtype, -1);
@@ -880,17 +881,17 @@ int mutt_can_decode (BODY * a)
 
     for (p = a->parts; p; p = p->next) {
       if (mutt_can_decode (p))
-        return (1);
+        return 1;
     }
   }
   else if (a->type == TYPEAPPLICATION) {
     if (mutt_is_application_pgp(a))
-      return (1);
+      return 1;
     if (mutt_is_application_smime (a))
-      return (1);
+      return 1;
   }
 
-  return (0);
+  return 0;
 }
 
 static int multipart_handler (BODY * a, STATE * s)
@@ -955,7 +956,7 @@ static int multipart_handler (BODY * a, STATE * s)
       a->encoding == ENCUUENCODED)
     body_list_wipe(&b);
 
-  return (rc);
+  return rc;
 }
 
 static int autoview_handler (BODY * a, STATE * s)
@@ -998,7 +999,7 @@ static int autoview_handler (BODY * a, STATE * s)
     if ((fpin = safe_fopen (tempfile, "w+")) == NULL) {
       mutt_perror ("fopen");
       rfc1524_entry_delete(&entry);
-      return (-1);
+      return -1;
     }
 
     mutt_copy_bytes (s->fpin, fpin, a->length);
@@ -1072,7 +1073,7 @@ static int autoview_handler (BODY * a, STATE * s)
       mutt_clear_error ();
   }
   rfc1524_entry_delete(&entry);
-  return (rc);
+  return rc;
 }
 
 static int external_body_handler (BODY * b, STATE * s)
@@ -1087,7 +1088,7 @@ static int external_body_handler (BODY * b, STATE * s)
       state_mark_attach (s);
       state_puts (_("[-- Error: message/external-body has no access-type parameter --]\n"), s);
     }
-    return (-1);
+    return -1;
   }
 
   expiration = parameter_getval(b->parameter, "expiration");
@@ -1154,7 +1155,7 @@ static int external_body_handler (BODY * b, STATE * s)
                      CH_DECODE, NULL);
     }
   }
-  return (0);
+  return 0;
 }
 
 static void mutt_decode_base64(STATE *s, long len, int istext, iconv_t cd)
@@ -1453,5 +1454,5 @@ int mutt_body_handler (BODY * b, STATE * s)
 
 bail:
   s->flags = oflags;
-  return (rc);
+  return rc;
 }