always build imap as well.

[apps/madmutt.git] / parse.c

diff --git a/parse.c b/parse.c
index 9c1195d..cd78866 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -155,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);
 }
@@ -273,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)
@@ -318,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 */
@@ -338,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);
   }
@@ -449,20 +428,6 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
         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)) {
-        m_strreplace(&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)
@@ -481,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,
@@ -567,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;
@@ -612,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
@@ -927,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);
     }