projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dead code.
[apps/madmutt.git]
/
lib-crypt
/
crypt.c
diff --git
a/lib-crypt/crypt.c
b/lib-crypt/crypt.c
index
5f744ee
..
f8cf471
100644
(file)
--- a/
lib-crypt/crypt.c
+++ b/
lib-crypt/crypt.c
@@
-299,9
+299,9
@@
void convert_to_7bit (BODY * a)
if (a->encoding != ENC7BIT) {
a->encoding = ENC7BIT;
convert_to_7bit (a->parts);
if (a->encoding != ENC7BIT) {
a->encoding = ENC7BIT;
convert_to_7bit (a->parts);
- }
- else if (option (OPTPGPSTRICTENC))
+ } else {
convert_to_7bit (a->parts);
convert_to_7bit (a->parts);
+ }
}
else if (a->type == TYPEMESSAGE &&
m_strcasecmp(a->subtype, "delivery-status")) {
}
else if (a->type == TYPEMESSAGE &&
m_strcasecmp(a->subtype, "delivery-status")) {
@@
-313,8
+313,7
@@
void convert_to_7bit (BODY * a)
else if (a->encoding == ENCBINARY)
a->encoding = ENCBASE64;
else if (a->content && a->encoding != ENCBASE64 &&
else if (a->encoding == ENCBINARY)
a->encoding = ENCBASE64;
else if (a->content && a->encoding != ENCBASE64 &&
- (a->content->from || (a->content->space &&
- option (OPTPGPSTRICTENC))))
+ (a->content->from || a->content->space))
a->encoding = ENCQUOTEDPRINTABLE;
a = a->next;
}
a->encoding = ENCQUOTEDPRINTABLE;
a = a->next;
}
@@
-328,7
+327,7
@@
void crypt_extract_keys_from_messages (HEADER * h)
address_t *tmp = NULL;
FILE *fpout;
address_t *tmp = NULL;
FILE *fpout;
- fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(
Te
mpdir), NULL);
+ fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(
MCore.t
mpdir), NULL);
if (!fpout) {
mutt_error(_("Could not create temporary file"));
return;
if (!fpout) {
mutt_error(_("Could not create temporary file"));
return;
@@
-537,7
+536,7
@@
int mutt_signed_handler (BODY * a, STATE * s)
crypt_fetch_signatures (&signatures, a->next, &sigcnt);
if (sigcnt) {
crypt_fetch_signatures (&signatures, a->next, &sigcnt);
if (sigcnt) {
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
Te
mpdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MCore.t
mpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
} else {
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
} else {