X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=f75fab1f5ed46d12e7029e7033537fcbc40de5e6;hp=d3a3773c099f917b7eab88bc0f448e35418d946d;hb=7bd63759186d38d5a751b94fe7ee047d69ba1287;hpb=8ab1ab66eb1c4b95f9b2a5ed9c2b2cf1dfa74544

diff --git a/handler.c b/handler.c
index d3a3773..f75fab1 100644
--- 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);
   }
 
@@ -189,85 +190,6 @@ static void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
   state_reset_prefix (s);
 }
 
-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];
-  ssize_t l = 0;
-
-  buf[4] = 0;
-
-  if (istext)
-    state_set_prefix (s);
-
-  while (len > 0) {
-    for (i = 0; i < 4 && len > 0; len--) {
-      if ((ch = fgetc (s->fpin)) == EOF)
-        break;
-      if (base64val(ch) >= 0 || ch == '=')
-        buf[i++] = ch;
-    }
-    if (i != 4) {
-      break;
-    }
-
-    c1 = base64val(buf[0]);
-    c2 = base64val(buf[1]);
-    ch = (c1 << 2) | (c2 >> 4);
-
-    if (cr && ch != '\n')
-      bufi[l++] = '\r';
-
-    cr = 0;
-
-    if (istext && ch == '\r')
-      cr = 1;
-    else
-      bufi[l++] = ch;
-
-    if (buf[2] == '=')
-      break;
-    c3 = base64val(buf[2]);
-    ch = ((c2 & 0xf) << 4) | (c3 >> 2);
-
-    if (cr && ch != '\n')
-      bufi[l++] = '\r';
-
-    cr = 0;
-
-    if (istext && ch == '\r')
-      cr = 1;
-    else
-      bufi[l++] = ch;
-
-    if (buf[3] == '=')
-      break;
-    c4 = base64val(buf[3]);
-    ch = ((c3 & 0x3) << 6) | c4;
-
-    if (cr && ch != '\n')
-      bufi[l++] = '\r';
-    cr = 0;
-
-    if (istext && ch == '\r')
-      cr = 1;
-    else
-      bufi[l++] = ch;
-
-    if (l + 8 >= ssizeof (bufi))
-      mutt_convert_to_state (cd, bufi, &l, s);
-  }
-
-  if (cr)
-    bufi[l++] = '\r';
-
-  mutt_convert_to_state (cd, bufi, &l, s);
-  mutt_convert_to_state (cd, 0, 0, s);
-
-  state_reset_prefix (s);
-}
-
 static unsigned char decode_byte(int ch)
 {
     return ch == 96 ? 0 : ch - 32;
@@ -738,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
@@ -894,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 */
@@ -935,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 */
@@ -945,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);
@@ -959,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)
@@ -1034,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)
@@ -1077,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);
@@ -1151,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)
@@ -1166,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");
@@ -1233,7 +1155,86 @@ 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)
+{
+  char buf[5];
+  int c1, c2, c3, c4, ch, cr = 0, i;
+  char bufi[BUFI_SIZE];
+  ssize_t l = 0;
+
+  buf[4] = 0;
+
+  if (istext)
+    state_set_prefix (s);
+
+  while (len > 0) {
+    for (i = 0; i < 4 && len > 0; len--) {
+      if ((ch = fgetc (s->fpin)) == EOF)
+        break;
+      if (base64val(ch) >= 0 || ch == '=')
+        buf[i++] = ch;
+    }
+    if (i != 4) {
+      break;
+    }
+
+    c1 = base64val(buf[0]);
+    c2 = base64val(buf[1]);
+    ch = (c1 << 2) | (c2 >> 4);
+
+    if (cr && ch != '\n')
+      bufi[l++] = '\r';
+
+    cr = 0;
+
+    if (istext && ch == '\r')
+      cr = 1;
+    else
+      bufi[l++] = ch;
+
+    if (buf[2] == '=')
+      break;
+    c3 = base64val(buf[2]);
+    ch = ((c2 & 0xf) << 4) | (c3 >> 2);
+
+    if (cr && ch != '\n')
+      bufi[l++] = '\r';
+
+    cr = 0;
+
+    if (istext && ch == '\r')
+      cr = 1;
+    else
+      bufi[l++] = ch;
+
+    if (buf[3] == '=')
+      break;
+    c4 = base64val(buf[3]);
+    ch = ((c3 & 0x3) << 6) | c4;
+
+    if (cr && ch != '\n')
+      bufi[l++] = '\r';
+    cr = 0;
+
+    if (istext && ch == '\r')
+      cr = 1;
+    else
+      bufi[l++] = ch;
+
+    if (l + 8 >= ssizeof (bufi))
+      mutt_convert_to_state (cd, bufi, &l, s);
+  }
+
+  if (cr)
+    bufi[l++] = '\r';
+
+  mutt_convert_to_state (cd, bufi, &l, s);
+  mutt_convert_to_state (cd, 0, 0, s);
+
+  state_reset_prefix (s);
 }
 
 void mutt_decode_attachment (BODY * b, STATE * s)
@@ -1453,5 +1454,5 @@ int mutt_body_handler (BODY * b, STATE * s)
 
 bail:
   s->flags = oflags;
-  return (rc);
+  return rc;
 }