projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rewrite mutt_read_rfc822_header to have a more consistent API.
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
3323af6
..
3f6a9ac
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-30,7
+30,7
@@
#include "pager.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#include "copy.h"
#include "mx.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "lib/debug.h"
#include "lib/debug.h"
@@
-325,6
+325,8
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
BODY tmp;
int n;
BODY tmp;
int n;
+ p_clear(&tmp, 1);
+
if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
snprintf (type, len, "%s/%s",
n == TYPEAUDIO ? "audio" :
if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
snprintf (type, len, "%s/%s",
n == TYPEAUDIO ? "audio" :
@@
-397,7
+399,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
int unlink_tempfile = 0;
is_message = mutt_is_message_type (a->type, a->subtype);
int unlink_tempfile = 0;
is_message = mutt_is_message_type (a->type, a->subtype);
- if (
WithCrypto &&
is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
+ if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||