X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=7da0547f6e1299835d927732d78cb18e671d0ed6;hp=74677fd7e3ef4056b68829dc05432337c93b28b4;hb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106;hpb=afa60149c4d2bb71c8195091d3658b3bdc12d59d

diff --git a/handler.c b/handler.c
index 74677fd..7da0547 100644
--- a/handler.c
+++ b/handler.c
@@ -19,13 +19,19 @@
 #include <sys/stat.h>
 
 #include "mutt.h"
+#include "ascii.h"
+#include "recvattach.h"
+#include "handler.h"
 #include "mutt_curses.h"
 #include "rfc1524.h"
+#include "rfc3676.h"
 #include "keymap.h"
 #include "mime.h"
 #include "copy.h"
 #include "charset.h"
 #include "mutt_crypt.h"
+#include "state.h"
+#include "attach.h"
 #include "lib.h"
 
 #include "lib/mem.h"
@@ -33,11 +39,7 @@
 #include "lib/str.h"
 #include "lib/debug.h"
 
-#define BUFI_SIZE 1000
-#define BUFO_SIZE 2000
-
-
-typedef void handler_f (BODY *, STATE *);
+typedef int handler_f (BODY *, STATE *);
 typedef handler_f *handler_t;
 
 int Index_hex[128] = {
@@ -62,52 +64,6 @@ int Index_64[128] = {
   41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
 };
 
-static void state_prefix_put (const char *d, size_t dlen, STATE * s)
-{
-  if (s->prefix)
-    while (dlen--)
-      state_prefix_putc (*d++, s);
-  else
-    fwrite (d, dlen, 1, s->fpout);
-}
-
-void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s)
-{
-  char bufo[BUFO_SIZE];
-  ICONV_CONST char *ib;
-  char *ob;
-  size_t ibl, obl;
-
-  if (!bufi) {
-    if (cd != (iconv_t) (-1)) {
-      ob = bufo, obl = sizeof (bufo);
-      iconv (cd, 0, 0, &ob, &obl);
-      if (ob != bufo)
-        state_prefix_put (bufo, ob - bufo, s);
-    }
-    if (Quotebuf[0] != '\0')
-      state_prefix_putc ('\n', s);
-    return;
-  }
-
-  if (cd == (iconv_t) (-1)) {
-    state_prefix_put (bufi, *l, s);
-    *l = 0;
-    return;
-  }
-
-  ib = bufi, ibl = *l;
-  for (;;) {
-    ob = bufo, obl = sizeof (bufo);
-    mutt_iconv (cd, &ib, &ibl, &ob, &obl, 0, "?");
-    if (ob == bufo)
-      break;
-    state_prefix_put (bufo, ob - bufo, s);
-  }
-  memmove (bufi, ib, ibl);
-  *l = ibl;
-}
-
 void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
 {
   int c, ch;
@@ -242,7 +198,7 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
     if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
       break;
 
-    linelen = mutt_strlen (line);
+    linelen = str_len (line);
     len -= linelen;
 
     /*
@@ -369,15 +325,15 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= mutt_strlen (tmps);
-    if ((!safe_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+    len -= str_len (tmps);
+    if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= mutt_strlen (tmps);
-    if (!safe_strncmp (tmps, "end", 3))
+    len -= str_len (tmps);
+    if (!str_ncmp (tmps, "end", 3))
       break;
     pt = tmps;
     linelen = decode_byte (*pt);
@@ -517,7 +473,7 @@ static void enriched_wrap (struct enriched_state *stte)
   stte->indent_len = 0;
   if (stte->s->prefix) {
     state_puts (stte->s->prefix, stte->s);
-    stte->indent_len += mutt_strlen (stte->s->prefix);
+    stte->indent_len += str_len (stte->s->prefix);
   }
 
   if (stte->tag_level[RICH_EXCERPT]) {
@@ -525,11 +481,11 @@ static void enriched_wrap (struct enriched_state *stte)
     while (x) {
       if (stte->s->prefix) {
         state_puts (stte->s->prefix, stte->s);
-        stte->indent_len += mutt_strlen (stte->s->prefix);
+        stte->indent_len += str_len (stte->s->prefix);
       }
       else {
         state_puts ("> ", stte->s);
-        stte->indent_len += mutt_strlen ("> ");
+        stte->indent_len += str_len ("> ");
       }
       x--;
     }
@@ -559,7 +515,7 @@ static void enriched_flush (struct enriched_state *stte, int wrap)
     stte->line_used += stte->buff_used;
     if (stte->line_used > stte->line_max) {
       stte->line_max = stte->line_used;
-      safe_realloc (&stte->line, stte->line_max + 1);
+      mem_realloc (&stte->line, stte->line_max + 1);
     }
     strcat (stte->line, stte->buffer);  /* __STRCAT_CHECKED__ */
     stte->line_len += stte->word_len;
@@ -576,7 +532,7 @@ static void enriched_putc (int c, struct enriched_state *stte)
   if (stte->tag_level[RICH_PARAM]) {
     if (stte->tag_level[RICH_COLOR]) {
       if (stte->param_used + 1 >= stte->param_len)
-        safe_realloc (&stte->param, (stte->param_len += STRING));
+        mem_realloc (&stte->param, (stte->param_len += STRING));
 
       stte->param[stte->param_used++] = c;
     }
@@ -586,7 +542,7 @@ static void enriched_putc (int c, struct enriched_state *stte)
   /* see if more space is needed (plus extra for possible rich characters) */
   if (stte->buff_len < stte->buff_used + 3) {
     stte->buff_len += LONG_STRING;
-    safe_realloc (&stte->buffer, stte->buff_len + 1);
+    mem_realloc (&stte->buffer, stte->buff_len + 1);
   }
 
   if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') {
@@ -627,18 +583,18 @@ static void enriched_putc (int c, struct enriched_state *stte)
   }
 }
 
-static void enriched_puts (char *s, struct enriched_state *stte)
+static void enriched_puts (const char *s, struct enriched_state *stte)
 {
-  char *c;
+  const char *p;
 
-  if (stte->buff_len < stte->buff_used + mutt_strlen (s)) {
+  if (stte->buff_len < stte->buff_used + str_len (s)) {
     stte->buff_len += LONG_STRING;
-    safe_realloc (&stte->buffer, stte->buff_len + 1);
+    mem_realloc (&stte->buffer, stte->buff_len + 1);
   }
-  c = s;
-  while (*c) {
-    stte->buffer[stte->buff_used++] = *c;
-    c++;
+
+  p = s;
+  while (*p) {
+    stte->buffer[stte->buff_used++] = *p++;
   }
 }
 
@@ -709,7 +665,7 @@ static void enriched_set_flags (const char *tag, struct enriched_state *stte)
   }
 }
 
-void text_enriched_handler (BODY * a, STATE * s)
+int text_enriched_handler (BODY * a, STATE * s)
 {
   enum {
     TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
@@ -727,15 +683,15 @@ void text_enriched_handler (BODY * a, STATE * s)
     ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
                                             72) ? (COLS - 4) : 72);
   stte.line_max = stte.WrapMargin * 4;
-  stte.line = (char *) safe_calloc (1, stte.line_max + 1);
-  stte.param = (char *) safe_calloc (1, STRING);
+  stte.line = (char *) mem_calloc (1, stte.line_max + 1);
+  stte.param = (char *) mem_calloc (1, STRING);
 
   stte.param_len = STRING;
   stte.param_used = 0;
 
   if (s->prefix) {
     state_puts (s->prefix, s);
-    stte.indent_len += mutt_strlen (s->prefix);
+    stte.indent_len += str_len (s->prefix);
   }
 
   while (state != DONE) {
@@ -819,191 +775,18 @@ void text_enriched_handler (BODY * a, STATE * s)
 
   state_putc ('\n', s);         /* add a final newline */
 
-  FREE (&(stte.buffer));
-  FREE (&(stte.line));
-  FREE (&(stte.param));
-}
-
-/*
- * An implementation of RFC 2646.
- *
- * NOTE: This still has to be made UTF-8 aware.
- *
- */
-
-#define FLOWED_MAX 77
-
-static int get_quote_level (char *line)
-{
-  int quoted;
-
-  for (quoted = 0; line[quoted] == '>'; quoted++);
-  return quoted;
-}
-
-static void print_flowed_line (char *line, STATE * s, int ql)
-{
-  int width;
-  char *pos, *oldpos;
-  int len = mutt_strlen (line);
-  int i;
-
-  if (MaxLineLength > 0) {
-    width = MaxLineLength - WrapMargin - ql - 1;
-    if (option (OPTSTUFFQUOTED))
-      --width;
-    if (width < 0)
-      width = MaxLineLength;
-  }
-  else {
-    if (option (OPTMBOXPANE))
-      width = COLS - SidebarWidth - WrapMargin - ql - 1;
-    else
-      width = COLS - WrapMargin - ql - 1;
-
-    if (option (OPTSTUFFQUOTED))
-      --width;
-    if (width < 0)
-      width = COLS;
-  }
-
-  /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
-
-  if (mutt_strlen (line) == 0) {
-    if (option (OPTQUOTEEMPTY)) {
-      if (s->prefix)
-        state_puts(s->prefix,s);
-      for (i=0;i<ql;++i) state_putc('>',s);
-      if (option(OPTSTUFFQUOTED))
-        state_putc(' ',s);
-    }
-    state_putc('\n',s);
-    return;
-  }
-
-  pos = line + ql + width;
-  oldpos = line + ql;
-  if (ql > 0 && ISBLANK (*oldpos))
-    ++oldpos;
-
-  /* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */
-
-  for (; oldpos < line + len; pos += width) {
-    /* fprintf(stderr,"outer for loop\n"); */
-    if (pos < line + len) {     /* only search a new position when we're not over the end of the string w/ pos */
-      /* fprintf(stderr,"if 1\n"); */
-      if (*pos == ' ') {
-        /* fprintf(stderr,"if 2: good luck! found a space\n"); */
-        *pos = '\0';
-        ++pos;
-      }
-      else {
-        /* fprintf(stderr,"if 2: else\n"); */
-        char *save = pos;
+  mem_free (&(stte.buffer));
+  mem_free (&(stte.line));
+  mem_free (&(stte.param));
 
-        while (pos >= oldpos && !isspace (*pos)) {
-          /* fprintf(stderr,"pos(%p) > oldpos(%p)\n",pos,oldpos); */
-          --pos;
-        }
-        if (pos < oldpos) {
-          /* fprintf(stderr,"wow, no space found, searching the other direction\n"); */
-          pos = save;
-          while (pos < line + len && *pos && !isspace (*pos)) {
-            /* fprintf(stderr,"pos(%p) < line+len(%p)\n",pos,line+len); */
-            ++pos;
-          }
-          /* fprintf(stderr,"found a space pos = %p\n",pos); */
-        }
-        *pos = '\0';
-        ++pos;
-      }
-    }
-    else {
-      /* fprintf(stderr,"if 1 else\n"); */
-    }
-    if (s->prefix)
-      state_puts (s->prefix, s);
-    for (i = 0; i < ql; ++i)
-      state_putc ('>', s);
-    if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix))
-      state_putc (' ', s);
-    state_puts (oldpos, s);
-    /* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */
-    if (pos < line + len)
-      state_putc (' ', s);
-    state_putc ('\n', s);
-    oldpos = pos;
-  }
-  /*state_puts(line,s);
-     state_putc('\n',s); */
-}
-
-static void text_plain_flowed_handler (BODY * a, STATE * s)
-{
-  int bytes = a->length;
-  char buf[LONG_STRING];
-  char *curline = strdup ("");
-  char *t;
-  unsigned int curline_len = 1;
-  unsigned int quotelevel = 0, newql = 0;
-  int first_line = 1;
-
-  while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
-
-    bytes -= mutt_strlen (buf);
-
-    newql = get_quote_level (buf);
-
-    if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
-      *t = '\0';
-      if (mutt_strlen (curline) > 0 && curline[mutt_strlen (curline) - 1] == ' '
-          && newql == quotelevel
-          && strcmp (curline + quotelevel, "-- ") != 0) {
-        if (buf[newql] == ' ')
-          curline[mutt_strlen (curline) - 1] = '\0';
-
-        curline = realloc (curline, curline_len + mutt_strlen (buf));
-        if (curline_len == 1)
-          *curline = '\0';
-        curline_len += mutt_strlen (buf);
-        safe_strncat (curline, curline_len, buf + newql,
-                      mutt_strlen (buf + newql));
-      }
-      else {
-        if (first_line) {
-          first_line = 0;
-        }
-        else {
-          print_flowed_line (curline, s, quotelevel);
-        }
-        FREE (&curline);
-        curline_len = 1;
-        curline = realloc (curline, curline_len + mutt_strlen (buf));
-        if (curline_len == 1)
-          *curline = '\0';
-        curline_len += mutt_strlen (buf);
-        safe_strncat (curline, curline_len, buf, mutt_strlen (buf));
-        quotelevel = newql;
-      }
-    }
-    else {
-      /* in case there's no [\r\n], we only have a single line
-       * -> display it (fixes #4709) */
-      print_flowed_line (buf, s, quotelevel);
-      /* TODO add handling of very long lines */
-    }
-  }
-  if (curline) {
-    print_flowed_line (curline, s, quotelevel);
-    FREE (&curline);
-  }
+  return (0);
 }
 
 #define TXTHTML     1
 #define TXTPLAIN    2
 #define TXTENRICHED 3
 
-static void alternative_handler (BODY * a, STATE * s)
+static int alternative_handler (BODY * a, STATE * s)
 {
   BODY *choice = NULL;
   BODY *b;
@@ -1011,6 +794,7 @@ static void alternative_handler (BODY * a, STATE * s)
   char buf[STRING];
   int type = 0;
   int mustfree = 0;
+  int rc = 0;
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED) {
@@ -1046,7 +830,7 @@ static void alternative_handler (BODY * a, STATE * s)
     }
     else {
       wild = 1;
-      btlen = mutt_strlen (t->data);
+      btlen = str_len (t->data);
     }
 
     if (a && a->parts)
@@ -1128,7 +912,7 @@ static void alternative_handler (BODY * a, STATE * s)
 
   if (choice) {
     if (s->flags & M_DISPLAY && !option (OPTWEED)) {
-      fseek (s->fpin, choice->hdr_offset, 0);
+      fseeko (s->fpin, choice->hdr_offset, 0);
       mutt_copy_bytes (s->fpin, s->fpout,
                        choice->offset - choice->hdr_offset);
     }
@@ -1137,23 +921,25 @@ static void alternative_handler (BODY * a, STATE * s)
   else if (s->flags & M_DISPLAY) {
     /* didn't find anything that we could display! */
     state_mark_attach (s);
-    state_puts (_
-                ("[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"),
-                s);
+    state_puts (_("[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"), s);
+    rc = -1;
   }
 
   if (mustfree)
     mutt_free_body (&a);
+
+  return (rc);
 }
 
 /* handles message/rfc822 body parts */
-void message_handler (BODY * a, STATE * s)
+static int message_handler (BODY * a, STATE * s)
 {
   struct stat st;
   BODY *b;
-  long off_start;
+  off_t off_start;
+  int rc = 0;
 
-  off_start = ftell (s->fpin);
+  off_start = ftello (s->fpin);
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED) {
     fstat (fileno (s->fpin), &st);
@@ -1176,12 +962,14 @@ void message_handler (BODY * a, STATE * s)
       state_puts (s->prefix, s);
     state_putc ('\n', s);
 
-    mutt_body_handler (b->parts, s);
+    rc = mutt_body_handler (b->parts, s);
   }
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED)
     mutt_free_body (&b);
+
+  return (rc);
 }
 
 /* returns 1 if decoding the attachment will produce output */
@@ -1221,12 +1009,13 @@ int mutt_can_decode (BODY * a)
   return (0);
 }
 
-void multipart_handler (BODY * a, STATE * s)
+static int multipart_handler (BODY * a, STATE * s)
 {
   BODY *b, *p;
   char length[5];
   struct stat st;
   int count;
+  int rc = 0;
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED) {
@@ -1260,7 +1049,7 @@ void multipart_handler (BODY * a, STATE * s)
       state_printf (s, _("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"),
                     TYPE (p), p->subtype, ENCODING (p->encoding), length);
       if (!option (OPTWEED)) {
-        fseek (s->fpin, p->hdr_offset, 0);
+        fseeko (s->fpin, p->hdr_offset, 0);
         mutt_copy_bytes (s->fpin, s->fpout, p->offset - p->hdr_offset);
       }
       else
@@ -1274,19 +1063,21 @@ void multipart_handler (BODY * a, STATE * s)
         state_printf (s, "%s: \n", p->form_name);
 
     }
-    mutt_body_handler (p, s);
+    rc = mutt_body_handler (p, s);
     state_putc ('\n', s);
-    if ((s->flags & M_REPLYING)
-        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))
+    if (rc || ((s->flags & M_REPLYING)
+        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
       break;
   }
 
   if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
       a->encoding == ENCUUENCODED)
     mutt_free_body (&b);
+
+  return (rc);
 }
 
-void autoview_handler (BODY * a, STATE * s)
+static int autoview_handler (BODY * a, STATE * s)
 {
   rfc1524_entry *entry = rfc1524_new_entry ();
   char buffer[LONG_STRING];
@@ -1299,15 +1090,16 @@ void autoview_handler (BODY * a, STATE * s)
   FILE *fperr = NULL;
   int piped = FALSE;
   pid_t thepid;
+  int rc = 0;
 
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
 
-  fname = safe_strdup (a->filename);
+  fname = str_dup (a->filename);
   mutt_sanitize_filename (fname, 1);
   rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
                            sizeof (tempfile));
-  FREE (&fname);
+  mem_free (&fname);
 
   if (entry->command) {
     strfcpy (command, entry->command, sizeof (command));
@@ -1325,7 +1117,7 @@ void autoview_handler (BODY * a, STATE * s)
     if ((fpin = safe_fopen (tempfile, "w+")) == NULL) {
       mutt_perror ("fopen");
       rfc1524_free_entry (&entry);
-      return;
+      return (-1);
     }
 
     mutt_copy_bytes (s->fpin, fpin, a->length);
@@ -1349,6 +1141,7 @@ void autoview_handler (BODY * a, STATE * s)
         state_mark_attach (s);
         state_printf (s, _("[-- Can't run %s. --]\n"), command);
       }
+      rc = -1;
       goto bail;
     }
 
@@ -1400,9 +1193,10 @@ void autoview_handler (BODY * a, STATE * s)
       mutt_clear_error ();
   }
   rfc1524_free_entry (&entry);
+  return (rc);
 }
 
-static void external_body_handler (BODY * b, STATE * s)
+static int external_body_handler (BODY * b, STATE * s)
 {
   const char *access_type;
   const char *expiration;
@@ -1412,11 +1206,9 @@ static void external_body_handler (BODY * b, STATE * s)
   if (!access_type) {
     if (s->flags & M_DISPLAY) {
       state_mark_attach (s);
-      state_puts (_
-                  ("[-- Error: message/external-body has no access-type parameter --]\n"),
-                  s);
+      state_puts (_("[-- Error: message/external-body has no access-type parameter --]\n"), s);
     }
-    return;
+    return (-1);
   }
 
   expiration = mutt_get_parameter ("expiration", b->parameter);
@@ -1450,7 +1242,7 @@ static void external_body_handler (BODY * b, STATE * s)
         state_printf (s, _("[-- name: %s --]\n"), b->parts->filename);
       }
 
-      mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+      mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
                      (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
                      CH_DECODE, NULL);
     }
@@ -1463,7 +1255,7 @@ static void external_body_handler (BODY * b, STATE * s)
       state_attach_puts (_("[-- and the indicated external source has --]\n"
                            "[-- expired. --]\n"), s);
 
-      mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+      mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
                      (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
                      CH_DECODE, NULL);
     }
@@ -1479,11 +1271,12 @@ static void external_body_handler (BODY * b, STATE * s)
                     _
                     ("[-- and the indicated access-type %s is unsupported --]\n"),
                     access_type);
-      mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+      mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
                      (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
                      CH_DECODE, NULL);
     }
   }
+  return (0);
 }
 
 void mutt_decode_attachment (BODY * b, STATE * s)
@@ -1495,7 +1288,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
 
   if (istext) {
     if (s->flags & M_CHARCONV) {
-      char *charset = mutt_get_parameter ("charset", b->parameter);
+      const char *charset = mutt_get_parameter ("charset", b->parameter);
 
       if (!option (OPTSTRICTMIME) && !charset)
         charset = mutt_get_first_charset (AssumedCharset);
@@ -1508,19 +1301,27 @@ void mutt_decode_attachment (BODY * b, STATE * s)
     }
   }
 
-  fseek (s->fpin, b->offset, 0);
+  fseeko (s->fpin, b->offset, 0);
   switch (b->encoding) {
   case ENCQUOTEDPRINTABLE:
-    mutt_decode_quoted (s, b->length, istext, cd);
+    mutt_decode_quoted (s, b->length, istext ||
+                        ((WithCrypto & APPLICATION_PGP) &&
+                         mutt_is_application_pgp (b)), cd);
     break;
   case ENCBASE64:
-    mutt_decode_base64 (s, b->length, istext, cd);
+    mutt_decode_base64 (s, b->length, istext ||
+                        ((WithCrypto & APPLICATION_PGP) &&
+                         mutt_is_application_pgp (b)), cd);
     break;
   case ENCUUENCODED:
-    mutt_decode_uuencoded (s, b->length, istext, cd);
+    mutt_decode_uuencoded (s, b->length, istext
+                           || ((WithCrypto & APPLICATION_PGP) &&
+                               mutt_is_application_pgp (b)), cd);
     break;
   default:
-    mutt_decode_xbit (s, b->length, istext, cd);
+    mutt_decode_xbit (s, b->length, istext
+                      || ((WithCrypto & APPLICATION_PGP) &&
+                          mutt_is_application_pgp (b)), cd);
     break;
   }
 
@@ -1528,7 +1329,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
     iconv_close (cd);
 }
 
-void mutt_body_handler (BODY * b, STATE * s)
+int mutt_body_handler (BODY * b, STATE * s)
 {
   int decode = 0;
   int plaintext = 0;
@@ -1538,6 +1339,7 @@ void mutt_body_handler (BODY * b, STATE * s)
   long tmpoffset = 0;
   size_t tmplength = 0;
   char type[STRING];
+  int rc = 0;
 
   int oflags = s->flags;
 
@@ -1563,7 +1365,7 @@ void mutt_body_handler (BODY * b, STATE * s)
       else
         if (ascii_strcasecmp
             ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-        handler = text_plain_flowed_handler;
+        handler = rfc3676_handler;
       else
         plaintext = 1;
     }
@@ -1595,7 +1397,7 @@ void mutt_body_handler (BODY * b, STATE * s)
         handler = mutt_signed_handler;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && safe_strcasecmp ("encrypted", b->subtype) == 0) {
+             && str_casecmp ("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)
@@ -1618,7 +1420,7 @@ void mutt_body_handler (BODY * b, STATE * s)
 
 
   if (plaintext || handler) {
-    fseek (s->fpin, b->offset, 0);
+    fseeko (s->fpin, b->offset, 0);
 
     /* see if we need to decode this part before processing it */
     if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE || b->encoding == ENCUUENCODED || plaintext || mutt_is_text_part (b)) {   /* text subtypes may
@@ -1658,7 +1460,7 @@ void mutt_body_handler (BODY * b, STATE * s)
       mutt_decode_attachment (b, s);
 
       if (decode) {
-        b->length = ftell (s->fpout);
+        b->length = ftello (s->fpout);
         b->offset = 0;
         fclose (s->fpout);
 
@@ -1677,7 +1479,7 @@ void mutt_body_handler (BODY * b, STATE * s)
 
     /* process the (decoded) body part */
     if (handler) {
-      handler (b, s);
+      rc = handler (b, s);
 
       if (decode) {
         b->length = tmplength;
@@ -1706,4 +1508,6 @@ void mutt_body_handler (BODY * b, STATE * s)
 
 bail:
   s->flags = oflags | (s->flags & M_FIRSTDONE);
+
+  return (rc);
 }