projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index
7bb0699
..
64b22f4
100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-12,7
+12,6
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
-#include "mutt_regex.h"
#include "mailbox.h"
#include "mime.h"
#include "rfc2047.h"
#include "mailbox.h"
#include "mime.h"
#include "rfc2047.h"
@@
-20,6
+19,11
@@
#include "mutt_crypt.h"
#include "url.h"
#include "mutt_crypt.h"
#include "url.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
@@
-42,7
+46,7
@@
static char *read_rfc822_line (FILE * f, char *line, size_t * linelen)
return (line);
}
return (line);
}
- buf += strlen (buf) - 1;
+ buf +=
mutt_
strlen (buf) - 1;
if (*buf == '\n') {
/* we did get a full line. remove trailing space */
while (ISSPACE (*buf))
if (*buf == '\n') {
/* we did get a full line. remove trailing space */
while (ISSPACE (*buf))
@@
-91,7
+95,7
@@
LIST *mutt_parse_references (char *s, int in_reply_to)
new = NULL;
if (*s == '<') {
new = NULL;
if (*s == '<') {
- n = strlen (s);
+ n =
mutt_
strlen (s);
if (s[n - 1] != '>') {
o = s;
s = NULL;
if (s[n - 1] != '>') {
o = s;
s = NULL;
@@
-101,7
+105,7
@@
LIST *mutt_parse_references (char *s, int in_reply_to)
new = safe_strdup (s);
}
else if (o) {
new = safe_strdup (s);
}
else if (o) {
- m = strlen (s);
+ m =
mutt_
strlen (s);
if (s[m - 1] == '>') {
new = safe_malloc (sizeof (char) * (n + m + 1));
strcpy (new, o); /* __STRCPY_CHECKED__ */
if (s[m - 1] == '>') {
new = safe_malloc (sizeof (char) * (n + m + 1));
strcpy (new, o); /* __STRCPY_CHECKED__ */
@@
-1253,7
+1257,7
@@
int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
/* Keep track of the user-defined headers */
if (!matched && user_hdrs) {
/* restore the original line */
/* Keep track of the user-defined headers */
if (!matched && user_hdrs) {
/* restore the original line */
- line[strlen (line)] = ':';
+ line[
mutt_
strlen (line)] = ':';
if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
&& !mutt_matches_ignore (line, UnIgnore))
if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
&& !mutt_matches_ignore (line, UnIgnore))
@@
-1347,7
+1351,7
@@
ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
*buf = '\0';
if (mutt_match_spam_list (line, SpamList, buf, sizeof (buf))) {
*buf = '\0';
if (mutt_match_spam_list (line, SpamList, buf, sizeof (buf))) {
- if (!
mutt_match_rx_list (line, NoSpamList
)) {
+ if (!
rx_list_match (NoSpamList, line
)) {
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {