always build imap as well.

[apps/madmutt.git] / parse.c

diff --git a/parse.c b/parse.c
index fd8e92b..cd78866 100644 (file)
--- 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"
 
@@ -156,13 +155,8 @@ int mutt_check_encoding (const char *c)
     return (ENCQUOTEDPRINTABLE);
   else if (ascii_strncasecmp ("base64", c, sizeof ("base64") - 1) == 0)
     return (ENCBASE64);
-  else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) ==
-           0)
+  else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) == 0)
     return (ENCUUENCODED);
-#ifdef SUN_ATTACHMENT
-  else if (ascii_strncasecmp ("uuencode", c, sizeof ("uuencode") - 1) == 0)
-    return (ENCUUENCODED);
-#endif
   else
     return (ENCOTHER);
 }
@@ -274,10 +268,6 @@ int mutt_check_mime_type (const char *s)
     return TYPETEXT;
   else if (ascii_strcasecmp ("multipart", s) == 0)
     return TYPEMULTIPART;
-#ifdef SUN_ATTACHMENT
-  else if (ascii_strcasecmp ("x-sun-attachment", s) == 0)
-    return TYPEMULTIPART;
-#endif
   else if (ascii_strcasecmp ("application", s) == 0)
     return TYPEAPPLICATION;
   else if (ascii_strcasecmp ("message", s) == 0)
@@ -319,13 +309,6 @@ void mutt_parse_content_type (char *s, BODY * ct)
     if ((pc = mutt_get_parameter ("name", ct->parameter)) != 0
         && !ct->filename)
       ct->filename = m_strdup(pc);
-
-#ifdef SUN_ATTACHMENT
-    /* this is deep and utter perversion */
-    if ((pc = mutt_get_parameter ("conversions", ct->parameter)) != 0)
-      ct->encoding = mutt_check_encoding (pc);
-#endif
-
   }
 
   /* Now get the subtype */
@@ -339,11 +322,6 @@ void mutt_parse_content_type (char *s, BODY * ct)
   /* Finally, get the major type */
   ct->type = mutt_check_mime_type (s);
 
-#ifdef SUN_ATTACHMENT
-  if (ascii_strcasecmp ("x-sun-attachment", s) == 0)
-    ct->subtype = m_strdup("x-sun-attachment");
-#endif
-
   if (ct->type == TYPEOTHER) {
     ct->xtype = m_strdup(s);
   }
@@ -396,7 +374,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,24 +424,10 @@ 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);
       }
     }
-#ifdef SUN_ATTACHMENT
-    else if (!ascii_strncasecmp ("x-sun-", line, 6)) {
-      if (!ascii_strcasecmp ("data-type", line + 6))
-        mutt_parse_content_type (c, p);
-      else if (!ascii_strcasecmp ("encoding-info", line + 6))
-        p->encoding = mutt_check_encoding (c);
-      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);
-        rfc2047_decode (&p->description);
-      }
-    }
-#endif
   }
   p->offset = ftello (fp);       /* Mark the start of the real data */
   if (p->type == TYPETEXT && !p->subtype)
@@ -482,13 +446,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
 
   switch (b->type) {
   case TYPEMULTIPART:
-#ifdef SUN_ATTACHMENT
-    if (!ascii_strcasecmp (b->subtype, "x-sun-attachment"))
-      bound = "--------";
-    else
-#endif
-      bound = mutt_get_parameter ("boundary", b->parameter);
-
+    bound = mutt_get_parameter ("boundary", b->parameter);
     fseeko (fp, b->offset, SEEK_SET);
     b->parts = mutt_parse_multipart (fp, bound,
                                      b->offset + b->length,
@@ -515,7 +473,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");
   }
 }
 
@@ -568,9 +526,6 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent)
 BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
                             int digest)
 {
-#ifdef SUN_ATTACHMENT
-  int lines;
-#endif
   int blen, len, crlf = 0;
   char buffer[LONG_STRING];
   BODY *head = 0, *last = 0, *new = 0;
@@ -613,17 +568,6 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
       else if (buffer[2 + blen] == 0) {
         new = mutt_read_mime_header (fp, digest);
 
-#ifdef SUN_ATTACHMENT
-        if (mutt_get_parameter ("content-lines", new->parameter)) {
-          for (lines =
-               atoi (mutt_get_parameter ("content-lines", new->parameter));
-               lines; lines--)
-            if (ftello (fp) >= end_off
-                || fgets (buffer, LONG_STRING, fp) == NULL)
-              break;
-        }
-#endif
-
         /*
          * Consistency checking - catch
          * bad attachment end boundaries
@@ -928,8 +872,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 +934,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 +949,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;
@@ -1035,8 +978,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 +1022,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;
           }
         }
@@ -1118,8 +1061,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 +1329,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 "