X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=54b4839fdcef9f2523d1112ebfd8bc33ae6be967;hp=30434af45e8a6cefacbacc64f454b8312e1abccc;hb=981e10e224fde4de5d40adcee1deda89df2715ca;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/handler.c b/handler.c
index 30434af..54b4839 100644
--- a/handler.c
+++ b/handler.c
@@ -12,7 +12,7 @@
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-sys/unix.h>
 
@@ -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;
@@ -639,9 +561,8 @@ static int text_enriched_handler (BODY * a, STATE * s)
 
   p_clear(&stte, 1);
   stte.s = s;
-  stte.WrapMargin =
-    ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
-                                            72) ? (COLS - 4) : 72);
+  stte.WrapMargin = ((s->flags & M_DISPLAY) ? (getmaxx(main_w) - 4) :
+                     ((getmaxx(main_w) - 4) < 72) ? (getmaxx(main_w) - 4) : 72);
   stte.line_max = stte.WrapMargin * 4;
   stte.line = p_new(char, stte.line_max + 1);
   stte.param = p_new(char, STRING);
@@ -1027,8 +948,7 @@ static int multipart_handler (BODY * a, STATE * s)
     }
     rc = mutt_body_handler (p, s);
     state_putc ('\n', s);
-    if (rc || ((s->flags & M_REPLYING)
-        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
+    if (rc)
       break;
   }
 
@@ -1238,6 +1158,85 @@ static int external_body_handler (BODY * b, STATE * s)
   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)
 {
   int istext = mutt_is_text_part (b);
@@ -1438,7 +1437,6 @@ int mutt_body_handler (BODY * b, STATE * s)
         s->fpin = fp;
       }
     }
-    s->flags |= M_FIRSTDONE;
   }
   else if (s->flags & M_DISPLAY) {
     state_mark_attach (s);
@@ -1455,7 +1453,6 @@ int mutt_body_handler (BODY * b, STATE * s)
   }
 
 bail:
-  s->flags = oflags | (s->flags & M_FIRSTDONE);
-
+  s->flags = oflags;
   return (rc);
 }