projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression, propably due to some changes in the string API
[apps/madmutt.git]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
c30a381
..
03b3940
100644
(file)
--- a/
pattern.c
+++ b/
pattern.c
@@
-11,20
+11,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.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 "mutt.h"
#include "mutt.h"
-#include "buffer.h"
#include "handler.h"
#include "enter.h"
#include "handler.h"
#include "enter.h"
-#include "ascii.h"
#include "mx.h"
#include "mapping.h"
#include "keymap.h"
#include "copy.h"
#include "mime.h"
#include "mx.h"
#include "mapping.h"
#include "keymap.h"
#include "copy.h"
#include "mime.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#ifdef USE_IMAP
#include "mx.h"
#ifdef USE_IMAP
#include "mx.h"
@@
-101,7
+103,7
@@
struct pattern_flags {
'=', M_DUPLICATED, 0, NULL}, {
'$', M_UNREFERENCED, 0, NULL}, {
'*', M_REALNAME, 0, NULL}, {
'=', M_DUPLICATED, 0, NULL}, {
'$', M_UNREFERENCED, 0, NULL}, {
'*', M_REALNAME, 0, NULL}, {
- 0}
+ 0
, 0, 0, NULL
}
};
static pattern_t *SearchPattern = NULL; /* current search pattern */
};
static pattern_t *SearchPattern = NULL; /* current search pattern */
@@
-162,7
+164,7
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
if ((msg = mx_open_message (ctx, msgno)) != NULL) {
if (option (OPTTHOROUGHSRC)) {
/* decode the header / body */
if ((msg = mx_open_message (ctx, msgno)) != NULL) {
if (option (OPTTHOROUGHSRC)) {
/* decode the header / body */
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
s.fpin = msg->fp;
s.flags = M_CHARCONV;
mutt_mktemp (tempfile);
s.fpin = msg->fp;
s.flags = M_CHARCONV;
mutt_mktemp (tempfile);
@@
-211,8
+213,7
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
}
}
}
}
- blen = STRING;
- buf = mem_malloc (blen);
+ buf = p_new(char, blen = STRING);
/* search the file "fp" */
while (lng > 0) {
/* search the file "fp" */
while (lng > 0) {
@@
-225,10
+226,10
@@
msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
match = 1;
break;
}
match = 1;
break;
}
- lng -=
str_len
(buf);
+ lng -=
m_strlen
(buf);
}
}
-
mem_free
(&buf);
+
p_delete
(&buf);
mx_close_message (&msg);
mx_close_message (&msg);
@@
-246,7
+247,7
@@
int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err)
BUFFER buf;
int r;
BUFFER buf;
int r;
-
memset (&buf, 0, sizeof (buf)
);
+
p_clear(&buf, 1
);
if (mutt_extract_token (&buf, s, M_TOKEN_PATTERN | M_TOKEN_COMMENT) != 0 ||
!buf.data) {
if (mutt_extract_token (&buf, s, M_TOKEN_PATTERN | M_TOKEN_COMMENT) != 0 ||
!buf.data) {
@@
-266,16
+267,16
@@
int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err)
#endif
if (pat->stringmatch) {
#endif
if (pat->stringmatch) {
- pat->str =
str_dup
(buf.data);
-
mem_free
(&buf.data);
+ pat->str =
m_strdup
(buf.data);
+
p_delete
(&buf.data);
} else {
} else {
- pat->rx =
mem_malloc (sizeof (regex_t)
);
+ pat->rx =
p_new(regex_t, 1
);
r = REGCOMP (pat->rx, buf.data, REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
r = REGCOMP (pat->rx, buf.data, REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
-
mem_free
(&buf.data);
+
p_delete
(&buf.data);
if (r) {
regerror (r, pat->rx, err->data, err->dsize);
regfree (pat->rx);
if (r) {
regerror (r, pat->rx, err->data, err->dsize);
regfree (pat->rx);
-
mem_free
(&pat->rx);
+
p_delete
(&pat->rx);
return (-1);
}
}
return (-1);
}
}
@@
-536,21
+537,21
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
BUFFER buffer;
struct tm min, max;
BUFFER buffer;
struct tm min, max;
-
memset (&buffer, 0, sizeof (buffer)
);
+
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);
return (-1);
}
if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0
|| !buffer.data) {
strfcpy (err->data, _("error in expression"), err->dsize);
return (-1);
}
-
memset (&min, 0, sizeof (min)
);
+
p_clear(&min, 1
);
/* the `0' time is Jan 1, 1970 UTC, so in order to prevent a negative time
when doing timezone conversion, we use Jan 2, 1970 UTC as the base
here */
min.tm_mday = 2;
min.tm_year = 70;
/* the `0' time is Jan 1, 1970 UTC, so in order to prevent a negative time
when doing timezone conversion, we use Jan 2, 1970 UTC as the base
here */
min.tm_mday = 2;
min.tm_year = 70;
-
memset (&max, 0, sizeof (max)
);
+
p_clear(&max, 1
);
/* Arbitrary year in the future. Don't set this too high
or mutt_mktime() returns something larger than will
/* Arbitrary year in the future. Don't set this too high
or mutt_mktime() returns something larger than will
@@
-603,7
+604,7
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
if (isdigit ((unsigned char) *pc)) {
/* mininum date specified */
if ((pc = getDate (pc, &min, err)) == NULL) {
if (isdigit ((unsigned char) *pc)) {
/* mininum date specified */
if ((pc = getDate (pc, &min, err)) == NULL) {
-
mem_free
(&buffer.data);
+
p_delete
(&buffer.data);
return (-1);
}
haveMin = TRUE;
return (-1);
}
haveMin = TRUE;
@@
-636,7
+637,7
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
max.tm_mday = min.tm_mday;
if (!parse_date_range (pc, &min, &max, haveMin, &baseMin, err)) { /* bail out on any parsing error */
max.tm_mday = min.tm_mday;
if (!parse_date_range (pc, &min, &max, haveMin, &baseMin, err)) { /* bail out on any parsing error */
-
mem_free
(&buffer.data);
+
p_delete
(&buffer.data);
return (-1);
}
}
return (-1);
}
}
@@
-648,7
+649,7
@@
static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
pat->min = mutt_mktime (&min, 1);
pat->max = mutt_mktime (&max, 1);
pat->min = mutt_mktime (&min, 1);
pat->max = mutt_mktime (&max, 1);
-
mem_free
(&buffer.data);
+
p_delete
(&buffer.data);
return 0;
}
return 0;
}
@@
-689,12
+690,12
@@
void mutt_pattern_free (pattern_t ** pat)
if (tmp->rx) {
regfree (tmp->rx);
if (tmp->rx) {
regfree (tmp->rx);
-
mem_free
(&tmp->rx);
+
p_delete
(&tmp->rx);
}
}
-
mem_free
(&tmp->str);
+
p_delete
(&tmp->str);
if (tmp->child)
mutt_pattern_free (&tmp->child);
if (tmp->child)
mutt_pattern_free (&tmp->child);
-
mem_free
(&tmp);
+
p_delete
(&tmp);
}
}
}
}
@@
-712,9
+713,9
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
char *buf;
BUFFER ps;
char *buf;
BUFFER ps;
-
memset (&ps, 0, sizeof (ps)
);
+
p_clear(&ps, 1
);
ps.dptr = s;
ps.dptr = s;
- ps.dsize =
str_len
(s);
+ ps.dsize =
m_strlen
(s);
while (*ps.dptr) {
SKIPWS (ps.dptr);
while (*ps.dptr) {
SKIPWS (ps.dptr);
@@
-818,11
+819,11
@@
pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
/* compile the sub-expression */
buf = str_substrdup (ps.dptr + 1, p);
if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
/* compile the sub-expression */
buf = str_substrdup (ps.dptr + 1, p);
if ((tmp = mutt_pattern_comp (buf, flags, err)) == NULL) {
-
mem_free
(&buf);
+
p_delete
(&buf);
mutt_pattern_free (&curlist);
return NULL;
}
mutt_pattern_free (&curlist);
return NULL;
}
-
mem_free
(&buf);
+
p_delete
(&buf);
if (last)
last->next = tmp;
else
if (last)
last->next = tmp;
else
@@
-1170,7
+1171,7
@@
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 */
+ if (ascii_strcasecmp ("all", s) == 0 || !
m_strcmp("^", s) || !m_strcmp
(".", s)) /* ~A is more efficient */
strfcpy (s, "~A", len);
else if (ascii_strcasecmp ("del", s) == 0)
strfcpy (s, "~D", len);
strfcpy (s, "~A", len);
else if (ascii_strcasecmp ("del", s) == 0)
strfcpy (s, "~D", len);
@@
-1209,13
+1210,13
@@
int mutt_pattern_func (int op, char *prompt)
mutt_message _("Compiling search pattern...");
mutt_message _("Compiling search pattern...");
- simple =
str_dup
(buf);
+ simple =
m_strdup
(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) {
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) {
-
mem_free
(&simple);
+
p_delete
(&simple);
mutt_error ("%s", err.data);
return (-1);
}
mutt_error ("%s", err.data);
return (-1);
}
@@
-1280,7
+1281,7
@@
int mutt_pattern_func (int op, char *prompt)
if (op == M_LIMIT) {
/* drop previous limit pattern */
if (op == M_LIMIT) {
/* drop previous limit pattern */
-
mem_free
(&Context->pattern);
+
p_delete
(&Context->pattern);
if (Context->limit_pattern)
mutt_pattern_free (&Context->limit_pattern);
if (Context->msgcount && !Context->vcount) {
if (Context->limit_pattern)
mutt_pattern_free (&Context->limit_pattern);
if (Context->msgcount && !Context->vcount) {
@@
-1294,7
+1295,7
@@
int mutt_pattern_func (int op, char *prompt)
Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
}
}
Context->limit_pattern = mutt_pattern_comp (buf, M_FULL_MSG, &err);
}
}
-
mem_free
(&simple);
+
p_delete
(&simple);
mutt_pattern_free (&pat);
return 0;
}
mutt_pattern_free (&pat);
return 0;
}
@@
-1326,7
+1327,7
@@
int mutt_search_command (int cur, int op)
strfcpy (temp, buf, sizeof (temp));
mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
strfcpy (temp, buf, sizeof (temp));
mutt_check_simple (temp, sizeof (temp), NONULL (SimpleSearch));
- if (!SearchPattern ||
str_cmp
(temp, LastSearchExpn)) {
+ if (!SearchPattern ||
m_strcmp
(temp, LastSearchExpn)) {
set_option (OPTSEARCHINVALID);
strfcpy (LastSearch, buf, sizeof (LastSearch));
mutt_message _("Compiling search pattern...");
set_option (OPTSEARCHINVALID);
strfcpy (LastSearch, buf, sizeof (LastSearch));
mutt_message _("Compiling search pattern...");