projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build mutt with pgp + smime support.
[apps/madmutt.git]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
66d8290
..
335337e
100644
(file)
--- a/
pattern.c
+++ b/
pattern.c
@@
-180,8
+180,8
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
if (pat->op != M_HEADER) {
mutt_parse_mime_message (ctx, h);
if (pat->op != M_HEADER) {
mutt_parse_mime_message (ctx, h);
- if (
WithCrypto && (h->security & ENCRYPT
)
-
&& !crypt_valid_passphrase (h->security))
{
+ if (
(h->security & ENCRYPT) && !crypt_valid_passphrase (h->security)
)
+ {
mx_close_message (&msg);
if (fp) {
fclose (fp);
mx_close_message (&msg);
if (fp) {
fclose (fp);
@@
-816,7
+816,7
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
return NULL;
}
/* compile the sub-expression */
return NULL;
}
/* compile the sub-expression */
- buf =
str_substrdup (ps.dptr + 1, p
);
+ buf =
p_dupstr(ps.dptr + 1, p - ps.dptr - 1
);
if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
p_delete(&buf);
mutt_pattern_free (&curlist);
if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
p_delete(&buf);
mutt_pattern_free (&curlist);
@@
-1069,20
+1069,12
@@
mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
case M_COLLAPSED:
return (pat->not ^ (h->collapsed && h->num_hidden > 1));
case M_CRYPT_SIGN:
case M_COLLAPSED:
return (pat->not ^ (h->collapsed && h->num_hidden > 1));
case M_CRYPT_SIGN:
- if (!WithCrypto)
- break;
return (pat->not ^ ((h->security & SIGN) ? 1 : 0));
case M_CRYPT_VERIFIED:
return (pat->not ^ ((h->security & SIGN) ? 1 : 0));
case M_CRYPT_VERIFIED:
- if (!WithCrypto)
- break;
return (pat->not ^ ((h->security & GOODSIGN) ? 1 : 0));
case M_CRYPT_ENCRYPT:
return (pat->not ^ ((h->security & GOODSIGN) ? 1 : 0));
case M_CRYPT_ENCRYPT:
- if (!WithCrypto)
- break;
return (pat->not ^ ((h->security & ENCRYPT) ? 1 : 0));
case M_PGP_KEY:
return (pat->not ^ ((h->security & ENCRYPT) ? 1 : 0));
case M_PGP_KEY:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
return (pat->not ^ ((h->security & APPLICATION_PGP)
&& (h->security & PGPKEY)));
case M_XLABEL:
return (pat->not ^ ((h->security & APPLICATION_PGP)
&& (h->security & PGPKEY)));
case M_XLABEL: