projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we're grownups now. don't care about stupid OS'es that don't know what an
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
9c379dc
..
adce68c
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-583,7
+583,7
@@
static void enriched_putc (int c, struct enriched_state *stte)
}
}
}
}
-static void enriched_puts (char *s, struct enriched_state *stte)
+static void enriched_puts (c
onst c
har *s, struct enriched_state *stte)
{
char *c;
{
char *c;
@@
-936,7
+936,7
@@
static int message_handler (BODY * a, STATE * s)
{
struct stat st;
BODY *b;
{
struct stat st;
BODY *b;
-
LOFF_T
off_start;
+
off_t
off_start;
int rc = 0;
off_start = ftello (s->fpin);
int rc = 0;
off_start = ftello (s->fpin);
@@
-1304,16
+1304,24
@@
void mutt_decode_attachment (BODY * b, STATE * s)
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
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:
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:
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:
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;
}
break;
}