Rocco Rutte:

[apps/madmutt.git] / parse.c

diff --git a/parse.c b/parse.c
index b8c322a..64b22f4 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     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
@@ -21,7 +12,6 @@
 #endif
 
 #include "mutt.h"
-#include "mutt_regex.h"
 #include "mailbox.h"
 #include "mime.h"
 #include "rfc2047.h"
@@ -29,6 +19,11 @@
 #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>
@@ -51,7 +46,7 @@ static char *read_rfc822_line (FILE * f, char *line, size_t * linelen)
       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))
@@ -100,7 +95,7 @@ LIST *mutt_parse_references (char *s, int in_reply_to)
     new = NULL;
 
     if (*s == '<') {
-      n = strlen (s);
+      n = mutt_strlen (s);
       if (s[n - 1] != '>') {
         o = s;
         s = NULL;
@@ -110,7 +105,7 @@ LIST *mutt_parse_references (char *s, int in_reply_to)
       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__ */
@@ -1262,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 */
-    line[strlen (line)] = ':';
+    line[mutt_strlen (line)] = ':';
 
     if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
         && !mutt_matches_ignore (line, UnIgnore))
@@ -1356,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))) {
-      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) {