/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>, and others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#if HAVE_CONFIG_H
#endif
#include "mutt.h"
+#include "buffer.h"
+#include "handler.h"
+#include "enter.h"
+#include "ascii.h"
+#include "mx.h"
#include "mapping.h"
#include "keymap.h"
-#include "mailbox.h"
#include "copy.h"
+#include "mime.h"
+
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
#include <string.h>
#include <stdlib.h>
'L', M_ADDRESS, 0, eat_regexp}, {
'l', M_LIST, 0, NULL}, {
'm', M_MESSAGE, 0, eat_range}, {
+ 'M', M_MULTIPART, 0, NULL}, {
'n', M_SCORE, 0, eat_range}, {
'N', M_NEW, 0, NULL}, {
'O', M_OLD, 0, NULL}, {
'T', M_TAG, 0, NULL}, {
't', M_TO, 0, eat_regexp}, {
'U', M_UNREAD, 0, NULL}, {
+ 'u', M_SUBSCRIBED_LIST, 0, NULL}, {
'v', M_COLLAPSED, 0, NULL}, {
'V', M_CRYPT_VERIFIED, 0, NULL},
#ifdef USE_NNTP
match = 1;
break;
}
- lng -= mutt_strlen (buf);
+ lng -= str_len (buf);
}
mx_close_message (&msg);
snprintf (err->data, err->dsize, _("Error in expression: %s"), s->dptr);
return (-1);
}
- pat->rx = safe_malloc (sizeof (regex_t));
+ pat->rx = mem_malloc (sizeof (regex_t));
r =
REGCOMP (pat->rx, buf.data,
REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
- FREE (&buf.data);
+ mem_free (&buf.data);
if (r) {
regerror (r, pat->rx, err->data, err->dsize);
regfree (pat->rx);
- FREE (&pat->rx);
+ mem_free (&pat->rx);
return (-1);
}
return 0;
if (isdigit ((unsigned char) *pc)) {
/* mininum date specified */
if ((pc = getDate (pc, &min, err)) == NULL) {
- FREE (&buffer.data);
+ mem_free (&buffer.data);
return (-1);
}
haveMin = TRUE;
max.tm_mday = min.tm_mday;
if (!parse_date_range (pc, &min, &max, haveMin, &baseMin, err)) { /* bail out on any parsing error */
- FREE (&buffer.data);
+ mem_free (&buffer.data);
return (-1);
}
}
pat->min = mutt_mktime (&min, 1);
pat->max = mutt_mktime (&max, 1);
- FREE (&buffer.data);
+ mem_free (&buffer.data);
return 0;
}
if (tmp->rx) {
regfree (tmp->rx);
- FREE (&tmp->rx);
+ mem_free (&tmp->rx);
}
if (tmp->child)
mutt_pattern_free (&tmp->child);
- FREE (&tmp);
+ mem_free (&tmp);
}
}
memset (&ps, 0, sizeof (ps));
ps.dptr = s;
- ps.dsize = mutt_strlen (s);
+ ps.dsize = str_len (s);
while (*ps.dptr) {
SKIPWS (ps.dptr);
return NULL;
}
/* compile the sub-expression */
- buf = mutt_substrdup (ps.dptr + 1, p);
+ buf = str_substrdup (ps.dptr + 1, p);
if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
- FREE (&buf);
+ mem_free (&buf);
mutt_pattern_free (&curlist);
return NULL;
}
- FREE (&buf);
+ mem_free (&buf);
if (last)
last->next = tmp;
else
pat->alladdr, 2, h->env->to,
h->env->cc)));
case M_LIST:
+ return (pat->
+ not ^ (h->env
+ && mutt_is_list_cc (pat->alladdr, h->env->to,
+ h->env->cc)));
+ case M_SUBSCRIBED_LIST:
return (pat->
not ^ (h->env
&& mutt_is_list_recipient (pat->alladdr, h->env->to,
return (pat->not ^ (h->thread && h->thread->duplicate_thread));
case M_UNREFERENCED:
return (pat->not ^ (h->thread && !h->thread->child));
+ case M_MULTIPART:
+ return (pat->not ^ (h->content && h->content->type == TYPEMULTIPART));
case M_REALNAME:
/* realname filter:
* we have a match if
if (!strchr (s, '~')) { /* yup, so spoof a real request */
/* convert old tokens into the new format */
- if (ascii_strcasecmp ("all", s) == 0 || !mutt_strcmp ("^", s) || !mutt_strcmp (".", s)) /* ~A is more efficient */
+ if (ascii_strcasecmp ("all", s) == 0 || !str_cmp ("^", s) || !str_cmp (".", s)) /* ~A is more efficient */
strfcpy (s, "~A", len);
else if (ascii_strcasecmp ("del", s) == 0)
strfcpy (s, "~D", len);
strfcpy (buf, NONULL (Context->pattern), sizeof (buf));
if (prompt || op != M_LIMIT)
- if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0
- || !buf[0])
+ if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0)
+ return (-1);
+ if (!buf[0]) {
+ if (op == M_LIMIT)
+ strncpy (buf, "~A", sizeof (buf));
+ else
return (-1);
+ }
mutt_message _("Compiling search pattern...");
- simple = safe_strdup (buf);
+ simple = str_dup (buf);
mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
err.data = error;
err.dsize = sizeof (error);
if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL) {
- FREE (&simple);
+ mem_free (&simple);
mutt_error ("%s", err.data);
return (-1);
}
mutt_clear_error ();
if (op == M_LIMIT) {
- FREE (&Context->pattern);
+ /* drop previous limit pattern */
+ mem_free (&Context->pattern);
if (Context->limit_pattern)
mutt_pattern_free (&Context->limit_pattern);
- if (!Context->vcount) {
+ if (Context->msgcount && !Context->vcount) {
mutt_error _("No messages matched criteria.");
-
-#if 0
- Context->vcount = Context->msgcount;
- /* restore full display */
- for (i = 0; i < Context->msgcount; i++) {
- Context->hdrs[i]->virtual = i;
- Context->v2r[i] = i;
- }
-#endif
}
- else if (mutt_strncmp (buf, "~A", 2) != 0) {
+
+ /* record new limit pattern, unless match all */
+ if (str_ncmp (buf, "~A", 2) != 0) {
Context->pattern = simple;
simple = NULL; /* don't clobber it */
Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
}
}
- FREE (&simple);
+ mem_free (&simple);
mutt_pattern_free (&pat);
return 0;
}
strfcpy (temp, buf, sizeof (temp));
mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
- if (!SearchPattern || mutt_strcmp (temp, LastSearchExpn)) {
+ if (!SearchPattern || str_cmp (temp, LastSearchExpn)) {
set_option (OPTSEARCHINVALID);
strfcpy (LastSearch, buf, sizeof (LastSearch));
mutt_message _("Compiling search pattern...");
projects / apps / madmutt.git / blobdiff