X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=d043331d8d1b3c76033ad37b95534411704aac08;hp=d83f12b8c10b539423b5316223750d7a2cd63118;hb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/parse.c b/parse.c
index d83f12b..d043331 100644
--- a/parse.c
+++ b/parse.c
@@ -23,7 +23,6 @@
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
-#include "rfc2047.h"
 #include "mutt_crypt.h"
 #include "url.h"
 
@@ -396,7 +395,7 @@ static void parse_content_disposition (char *s, BODY * ct)
     s = vskipspaces(s + 1);
     if ((s = mutt_get_parameter("filename",
                                 (parms = parse_parameters (s)))) != 0)
-      str_replace (&ct->filename, s);
+      m_strreplace(&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
       ct->form_name = m_strdup(s);
     mutt_free_parameter (&parms);
@@ -446,7 +445,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
       else if (!ascii_strcasecmp ("disposition", line + 8))
         parse_content_disposition (c, p);
       else if (!ascii_strcasecmp ("description", line + 8)) {
-        str_replace (&p->description, c);
+        m_strreplace(&p->description, c);
         rfc2047_decode (&p->description);
       }
     }
@@ -459,7 +458,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
       else if (!ascii_strcasecmp ("content-lines", line + 6))
         mutt_set_parameter ("content-lines", c, &(p->parameter));
       else if (!ascii_strcasecmp ("data-description", line + 6)) {
-        str_replace (&p->description, c);
+        m_strreplace(&p->description, c);
         rfc2047_decode (&p->description);
       }
     }
@@ -515,7 +514,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
   /* try to recover from parsing error */
   if (!b->parts) {
     b->type = TYPETEXT;
-    str_replace (&b->subtype, "plain");
+    m_strreplace(&b->subtype, "plain");
   }
 }
 
@@ -928,8 +927,7 @@ void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur)
     if ((msg = mx_open_message (ctx, cur->msgno))) {
       mutt_parse_part (msg->fp, cur->content);
 
-      if (WithCrypto)
-        cur->security = crypt_query (cur->content);
+      cur->security = crypt_query (cur->content);
 
       mx_close_message (&msg);
     }
@@ -991,7 +989,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       }
       else if (ascii_strcasecmp (line + 8, "description") == 0) {
         if (hdr) {
-          str_replace (&hdr->content->description, p);
+          m_strreplace(&hdr->content->description, p);
           rfc2047_decode (&hdr->content->description);
         }
         matched = 1;
@@ -1006,7 +1004,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
   case 'd':
     if (!ascii_strcasecmp ("ate", line + 1)) {
-      str_replace (&e->date, p);
+      m_strreplace(&e->date, p);
       if (hdr)
         hdr->date_sent = mutt_parse_date (p, hdr);
       matched = 1;
@@ -1027,7 +1025,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
        * and mark mail/(esp.) news article as your own. aaargh! this
        * bothered me for _years_ */
       if (!e->from) {
-        e->from = rfc822_new_address ();
+        e->from = address_new ();
         e->from->personal = m_strdup(p);
       }
       matched = 1;
@@ -1035,8 +1033,8 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 #ifdef USE_NNTP
     else if (!m_strcasecmp(line + 1, "ollowup-to")) {
       if (!e->followup_to) {
-        str_skip_trailws (p);
-        e->followup_to = m_strdup(vskipspaces(p));
+        m_strrtrim(p);
+        e->followup_to = m_strdup(skipspaces(p));
       }
       matched = 1;
     }
@@ -1079,7 +1077,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
           /* Take the first mailto URL */
           if (url_check_scheme (beg) == U_MAILTO) {
             p_delete(&e->list_post);
-            e->list_post = str_substrdup (beg, end);
+            e->list_post = p_dupstr(beg, end - beg);
             break;
           }
         }
@@ -1103,7 +1101,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     else if (!ascii_strncasecmp (line + 1, "ail-", 4)) {
       if (!ascii_strcasecmp (line + 5, "reply-to")) {
         /* override the Reply-To: field */
-        rfc822_free_address (&e->reply_to);
+        address_delete (&e->reply_to);
         e->reply_to = rfc822_parse_adrlist (e->reply_to, p);
         matched = 1;
       }
@@ -1118,8 +1116,8 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
   case 'n':
     if (!m_strcasecmp(line + 1, "ewsgroups")) {
       p_delete(&e->newsgroups);
-      str_skip_trailws (p);
-      e->newsgroups = m_strdup(vskipspaces(p));
+      m_strrtrim(p);
+      e->newsgroups = m_strdup(skipspaces(p));
       matched = 1;
     }
     break;
@@ -1386,7 +1384,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
   if (hdr) {
     hdr->content->hdr_offset = hdr->offset;
     hdr->content->offset = ftello (f);
-    rfc2047_decode_envelope (e);
+    rfc2047_decode_envelope(e);
     /* check for missing or invalid date */
     if (hdr->date_sent <= 0) {
       debug_print (1, ("no date found, using received "