projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove some cruft
[apps/madmutt.git]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
46efa88
..
95157b1
100644
(file)
--- a/
pattern.c
+++ b/
pattern.c
@@
-15,22
+15,21
@@
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/enter.h>
#include "mutt.h"
#include "mutt.h"
-#include "buffer.h"
#include "handler.h"
#include "handler.h"
-#include "enter.h"
#include "mx.h"
#include "mx.h"
-#include "mapping.h"
#include "keymap.h"
#include "copy.h"
#include "keymap.h"
#include "copy.h"
-#include "mime.h"
-
-#ifdef USE_IMAP
-#include "mx.h"
-#include "imap/imap.h"
-#endif
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-39,7
+38,7
@@
#include <unistd.h>
#include <stdarg.h>
#include <unistd.h>
#include <stdarg.h>
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
static int eat_regexp (pattern_t * pat, BUFFER *, BUFFER *);
static int eat_date (pattern_t * pat, BUFFER *, BUFFER *);
static int eat_regexp (pattern_t * pat, BUFFER *, BUFFER *);
static int eat_date (pattern_t * pat, BUFFER *, BUFFER *);
@@
-158,7
+157,7
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
int match = 0;
HEADER *h = ctx->hdrs[msgno];
char* buf;
int match = 0;
HEADER *h = ctx->hdrs[msgno];
char* buf;
- size_t blen;
+ s
s
ize_t blen;
if ((msg = mx_open_message (ctx, msgno)) != NULL) {
if (option (OPTTHOROUGHSRC)) {
if ((msg = mx_open_message (ctx, msgno)) != NULL) {
if (option (OPTTHOROUGHSRC)) {
@@
-178,8
+177,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);
@@
-217,7
+216,7
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
/* search the file "fp" */
while (lng > 0) {
if (pat->op == M_HEADER) {
/* search the file "fp" */
while (lng > 0) {
if (pat->op == M_HEADER) {
- if (
*(buf = mutt_read_rfc822_line (fp, buf, &blen)) == '\0'
)
+ if (
!mutt_read_rfc822_line(fp, &buf, &blen)
)
break;
} else if (fgets (buf, blen - 1, fp) == NULL)
break; /* don't loop forever */
break;
} else if (fgets (buf, blen - 1, fp) == NULL)
break; /* don't loop forever */
@@
-289,7
+288,7
@@
static int patmatch (const pattern_t* pat, const char* buf) {
return regexec (pat->rx, buf, 0, NULL, 0);
}
return regexec (pat->rx, buf, 0, NULL, 0);
}
-int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err)
+int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err
__attribute__ ((unused))
)
{
char *tmp;
int do_exclusive = 0;
{
char *tmp;
int do_exclusive = 0;
@@
-358,8
+357,7
@@
int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err)
if (skip_quote && *tmp == '"')
tmp++;
if (skip_quote && *tmp == '"')
tmp++;
- SKIPWS (tmp);
- s->dptr = tmp;
+ s->dptr = vskipspaces(tmp);
return 0;
}
return 0;
}
@@
-467,7
+465,7
@@
static const char *parse_date_range (const char *pc, struct tm *min,
const char *pt;
char ch = *pc++;
const char *pt;
char ch = *pc++;
-
SKIPWS
(pc);
+
pc = vskipspaces
(pc);
switch (ch) {
case '-':
{
switch (ch) {
case '-':
{
@@
-523,7
+521,7
@@
static const char *parse_date_range (const char *pc, struct tm *min,
default:
flag |= M_PDR_ERRORDONE;
}
default:
flag |= M_PDR_ERRORDONE;
}
-
SKIPWS
(pc);
+
pc = vskipspaces
(pc);
}
if ((flag & M_PDR_ERROR) && !(flag & M_PDR_ABSOLUTE)) { /* getDate has its own error message, don't overwrite it here */
snprintf (err->data, err->dsize, _("Invalid relative date: %s"), pc - 1);
}
if ((flag & M_PDR_ERROR) && !(flag & M_PDR_ABSOLUTE)) { /* getDate has its own error message, don't overwrite it here */
snprintf (err->data, err->dsize, _("Invalid relative date: %s"), pc - 1);
@@
-539,7
+537,7
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
p_clear(&buffer, 1);
if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0
|| !buffer.data) {
p_clear(&buffer, 1);
if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0
|| !buffer.data) {
-
strfcpy (err->data, _("error in expression"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("error in expression")
);
return (-1);
}
return (-1);
}
@@
-607,11
+605,11
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
return (-1);
}
haveMin = TRUE;
return (-1);
}
haveMin = TRUE;
-
SKIPWS
(pc);
+
pc = vskipspaces
(pc);
if (*pc == '-') {
if (*pc == '-') {
- const char *pt
= pc + 1
;
+ const char *pt;
-
SKIPWS (pt
);
+
pt = skipspaces(pc + 1
);
untilNow = (*pt == '\0');
}
}
untilNow = (*pt == '\0');
}
}
@@
-717,7
+715,7
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
ps.dsize = m_strlen(s);
while (*ps.dptr) {
ps.dsize = m_strlen(s);
while (*ps.dptr) {
-
SKIPWS
(ps.dptr);
+
ps.dptr = vskipspaces
(ps.dptr);
switch (*ps.dptr) {
case '^':
ps.dptr++;
switch (*ps.dptr) {
case '^':
ps.dptr++;
@@
-791,8
+789,7
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
}
tmp->op = entry->op;
}
tmp->op = entry->op;
- ps.dptr++; /* eat the operator and any optional whitespace */
- SKIPWS (ps.dptr);
+ ps.dptr = vskipspaces(ps.dptr + 1);
if (entry->eat_arg) {
if (!*ps.dptr) {
if (entry->eat_arg) {
if (!*ps.dptr) {
@@
-816,7
+813,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);
@@
-841,7
+838,7
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
}
}
if (!curlist) {
}
}
if (!curlist) {
-
strfcpy (err->data, _("empty pattern"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("empty pattern")
);
return NULL;
}
if (curlist->next) {
return NULL;
}
if (curlist->next) {
@@
-873,15
+870,15
@@
perform_or (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT * ctx,
return 0;
}
return 0;
}
-static int match_adrlist (pattern_t* pat, int match_personal, int alladdr,
+static int match_adrlist (pattern_t* pat, int match_personal, int alladdr
__attribute__ ((unused))
,
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
+900,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
+911,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
+922,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))
@@
-1000,11
+997,9
@@
mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
case M_BODY:
case M_HEADER:
case M_WHOLE_MSG:
case M_BODY:
case M_HEADER:
case M_WHOLE_MSG:
-#ifdef USE_IMAP
/* IMAP search sets h->matched at search compile time */
if (ctx->magic == M_IMAP && pat->stringmatch)
return (h->matched);
/* IMAP search sets h->matched at search compile time */
if (ctx->magic == M_IMAP && pat->stringmatch)
return (h->matched);
-#endif
return (pat->not ^ msg_search (ctx, pat, h->msgno));
case M_SENDER:
return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
return (pat->not ^ msg_search (ctx, pat, h->msgno));
case M_SENDER:
return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS,
@@
-1069,20
+1064,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:
@@
-1145,9
+1132,9
@@
mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
return (-1);
}
return (-1);
}
-static void quote_simple (char *tmp, size_t len, const char *p)
+static void quote_simple (char *tmp, s
s
ize_t len, const char *p)
{
{
-
in
t i = 0;
+
ssize_
t i = 0;
tmp[i++] = '"';
while (*p && i < len - 3) {
tmp[i++] = '"';
while (*p && i < len - 3) {
@@
-1170,24
+1157,24
@@
void mutt_check_simple (char *s, size_t len, const char *simple)
if (!strchr (s, '~') && !strchr (s, '=')) { /* yup, so spoof a real request */
/* convert old tokens into the new format */
if (!strchr (s, '~') && !strchr (s, '=')) { /* yup, so spoof a real request */
/* convert old tokens into the new format */
- if (ascii_strcasecmp ("all", s) == 0 || !
str_cmp ("^", s) || !str_cmp
(".", s)) /* ~A is more efficient */
-
strfcpy (s, "~A", len
);
+ if (ascii_strcasecmp ("all", s) == 0 || !
m_strcmp("^", s) || !m_strcmp
(".", s)) /* ~A is more efficient */
+
m_strcpy(s, len, "~A"
);
else if (ascii_strcasecmp ("del", s) == 0)
else if (ascii_strcasecmp ("del", s) == 0)
-
strfcpy (s, "~D", len
);
+
m_strcpy(s, len, "~D"
);
else if (ascii_strcasecmp ("flag", s) == 0)
else if (ascii_strcasecmp ("flag", s) == 0)
-
strfcpy (s, "~F", len
);
+
m_strcpy(s, len, "~F"
);
else if (ascii_strcasecmp ("new", s) == 0)
else if (ascii_strcasecmp ("new", s) == 0)
-
strfcpy (s, "~N", len
);
+
m_strcpy(s, len, "~N"
);
else if (ascii_strcasecmp ("old", s) == 0)
else if (ascii_strcasecmp ("old", s) == 0)
-
strfcpy (s, "~O", len
);
+
m_strcpy(s, len, "~O"
);
else if (ascii_strcasecmp ("repl", s) == 0)
else if (ascii_strcasecmp ("repl", s) == 0)
-
strfcpy (s, "~Q", len
);
+
m_strcpy(s, len, "~Q"
);
else if (ascii_strcasecmp ("read", s) == 0)
else if (ascii_strcasecmp ("read", s) == 0)
-
strfcpy (s, "~R", len
);
+
m_strcpy(s, len, "~R"
);
else if (ascii_strcasecmp ("tag", s) == 0)
else if (ascii_strcasecmp ("tag", s) == 0)
-
strfcpy (s, "~T", len
);
+
m_strcpy(s, len, "~T"
);
else if (ascii_strcasecmp ("unread", s) == 0)
else if (ascii_strcasecmp ("unread", s) == 0)
-
strfcpy (s, "~U", len
);
+
m_strcpy(s, len, "~U"
);
else {
quote_simple (tmp, sizeof (tmp), s);
mutt_expand_fmt (s, len, simple, tmp);
else {
quote_simple (tmp, sizeof (tmp), s);
mutt_expand_fmt (s, len, simple, tmp);
@@
-1202,7
+1189,7
@@
int mutt_pattern_func (int op, char *prompt)
BUFFER err;
int i;
BUFFER err;
int i;
-
strfcpy (buf, NONULL (Context->pattern), sizeof (buf
));
+
m_strcpy(buf, sizeof(buf), NONULL(Context->pattern
));
if (prompt || op != M_LIMIT)
if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0])
return (-1);
if (prompt || op != M_LIMIT)
if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0])
return (-1);
@@
-1220,10
+1207,8
@@
int mutt_pattern_func (int op, char *prompt)
return (-1);
}
return (-1);
}
-#ifdef USE_IMAP
if (Context->magic == M_IMAP && imap_search (Context, pat) < 0)
return -1;
if (Context->magic == M_IMAP && imap_search (Context, pat) < 0)
return -1;
-#endif
mutt_message _("Executing command on matching messages...");
mutt_message _("Executing command on matching messages...");
@@
-1288,7
+1273,7
@@
int mutt_pattern_func (int op, char *prompt)
}
/* record new limit pattern, unless match all */
}
/* record new limit pattern, unless match all */
- if (
str_ncmp
(buf, "~A", 2) != 0) {
+ if (
m_strncmp
(buf, "~A", 2) != 0) {
Context->pattern = simple;
simple = NULL; /* don't clobber it */
Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
Context->pattern = simple;
simple = NULL; /* don't clobber it */
Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
@@
-1310,7
+1295,7
@@
int mutt_search_command (int cur, int op)
HEADER *h;
if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
HEADER *h;
if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
-
strfcpy (buf, LastSearch, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), LastSearch
);
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "), buf, sizeof (buf),
M_CLEAR | M_PATTERN) != 0 || !buf[0])
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "), buf, sizeof (buf),
M_CLEAR | M_PATTERN) != 0 || !buf[0])
@@
-1323,12
+1308,12
@@
int mutt_search_command (int cur, int op)
/* compare the *expanded* version of the search pattern in case
$simple_search has changed while we were searching */
/* compare the *expanded* version of the search pattern in case
$simple_search has changed while we were searching */
-
strfcpy (temp, buf, sizeof (temp)
);
+
m_strcpy(temp, sizeof(temp), buf
);
mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
- if (!SearchPattern ||
str_cmp
(temp, LastSearchExpn)) {
+ if (!SearchPattern ||
m_strcmp
(temp, LastSearchExpn)) {
set_option (OPTSEARCHINVALID);
set_option (OPTSEARCHINVALID);
-
strfcpy (LastSearch, buf, sizeof (LastSearch)
);
+
m_strcpy(LastSearch, sizeof(LastSearch), buf
);
mutt_message _("Compiling search pattern...");
mutt_pattern_free (&SearchPattern);
mutt_message _("Compiling search pattern...");
mutt_pattern_free (&SearchPattern);
@@
-1351,10
+1336,8
@@
int mutt_search_command (int cur, int op)
if (option (OPTSEARCHINVALID)) {
for (i = 0; i < Context->msgcount; i++)
Context->hdrs[i]->searched = 0;
if (option (OPTSEARCHINVALID)) {
for (i = 0; i < Context->msgcount; i++)
Context->hdrs[i]->searched = 0;
-#ifdef USE_IMAP
if (Context->magic == M_IMAP && imap_search (Context, SearchPattern) < 0)
return -1;
if (Context->magic == M_IMAP && imap_search (Context, SearchPattern) < 0)
return -1;
-#endif
unset_option (OPTSEARCHINVALID);
}
unset_option (OPTSEARCHINVALID);
}