projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics
[apps/madmutt.git]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
7a535bb
..
d388924
100644
(file)
--- a/
pattern.c
+++ b/
pattern.c
@@
-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);
@@
-877,11
+877,11
@@
static int match_adrlist (pattern_t* pat, int match_personal, int alladdr,
int n, ...)
{
va_list ap;
int n, ...)
{
va_list ap;
-
ADDRESS
*a;
+
address_t
*a;
va_start (ap, n);
for (; n; n--) {
va_start (ap, n);
for (; n; n--) {
- for (a = va_arg (ap,
ADDRESS
*); a; a = a->next) {
+ for (a = va_arg (ap,
address_t
*); a; a = a->next) {
if (pat->alladdr ^
((a->mailbox && patmatch (pat, a->mailbox) == 0) ||
(match_personal && a->personal &&
if (pat->alladdr ^
((a->mailbox && patmatch (pat, a->mailbox) == 0) ||
(match_personal && a->personal &&
@@
-903,7
+903,7
@@
static int match_reference (pattern_t* pat, LIST * refs)
return 0;
}
return 0;
}
-int mutt_is_list_recipient (int alladdr,
ADDRESS * a1, ADDRESS
* a2)
+int mutt_is_list_recipient (int alladdr,
address_t * a1, address_t
* a2)
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_is_subscribed_list (a1))
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_is_subscribed_list (a1))
@@
-914,7
+914,7
@@
int mutt_is_list_recipient (int alladdr, ADDRESS * a1, ADDRESS * a2)
return alladdr;
}
return alladdr;
}
-int mutt_is_list_cc (int alladdr,
ADDRESS * a1, ADDRESS
* a2)
+int mutt_is_list_cc (int alladdr,
address_t * a1, address_t
* a2)
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_is_mail_list (a1))
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_is_mail_list (a1))
@@
-925,7
+925,7
@@
int mutt_is_list_cc (int alladdr, ADDRESS * a1, ADDRESS * a2)
return alladdr;
}
return alladdr;
}
-static int match_user (int alladdr,
ADDRESS * a1, ADDRESS
* a2)
+static int match_user (int alladdr,
address_t * a1, address_t
* a2)
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_addr_is_user (a1))
{
for (; a1; a1 = a1->next)
if (alladdr ^ mutt_addr_is_user (a1))