X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fmime.c;h=dc50d2d6a7128980773ac3e90742e8fb9c5f42d2;hp=98237cf92544d16531eece93f2537a5467ef1f1f;hb=a0aa4a45870f1607e8b41760866071692675c84d;hpb=69f4685e616347559d4ec714fd826d7f97a472ef

diff --git a/lib-mime/mime.c b/lib-mime/mime.c
index 98237cf..dc50d2d 100644
--- a/lib-mime/mime.c
+++ b/lib-mime/mime.c
@@ -16,13 +16,15 @@
  *
  *  Copyright © 2006 Pierre Habouzit
  */
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
+ * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
+ */
 
-#include <lib-lib/ascii.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
 
-#include "mime-types.h"
-
-#include "mutt.h"
+#include "mime.h"
 
 #define BOUNDARYLEN 16
 
@@ -134,18 +136,6 @@ void parameter_set_boundary(parameter_t **parm)
 /* XXX                                                                      */
 /****************************************************************************/
 
-void rfc1524_entry_wipe(rfc1524_entry *p)
-{
-    p_delete(&p->command);
-    p_delete(&p->testcommand);
-    p_delete(&p->composecommand);
-    p_delete(&p->composetypecommand);
-    p_delete(&p->editcommand);
-    p_delete(&p->printcommand);
-    p_delete(&p->nametemplate);
-    p_delete(&p->convert);
-}
-
 void envelope_wipe(ENVELOPE *p)
 {
     address_list_wipe(&p->return_path);
@@ -178,10 +168,36 @@ void envelope_wipe(ENVELOPE *p)
     string_list_wipe(&p->userhdrs);
 }
 
+void body_wipe(BODY *b)
+{
+    if (b->parameter)
+        parameter_list_wipe(&b->parameter);
+
+    if (b->unlink && b->filename) {
+        unlink (b->filename);
+    }
+
+    p_delete(&b->filename);
+    p_delete(&b->content);
+    p_delete(&b->xtype);
+    p_delete(&b->subtype);
+    p_delete(&b->description);
+    p_delete(&b->form_name);
+
+    if (b->hdr) {
+        /* Don't free twice (b->hdr->content = b->parts) */
+        b->hdr->content = NULL;
+        header_delete(&b->hdr);
+    }
+
+    if (b->parts)
+        body_list_wipe(&b->parts);
+}
+
 void header_wipe(HEADER *h)
 {
     envelope_delete(&h->env);
-    mutt_free_body (&h->content);
+    body_list_wipe(&h->content);
     p_delete(&h->maildir_flags);
     p_delete(&h->tree);
     p_delete(&h->path);
@@ -191,6 +207,35 @@ void header_wipe(HEADER *h)
     p_delete(&h->data);
 }
 
+
+/****************************************************************************/
+/* misc functions                                                           */
+/****************************************************************************/
+
+int mutt_is_text_part(BODY * b)
+{
+    char *s = b->subtype;
+
+    if (mutt_is_application_pgp(b))
+        return 0;
+
+    switch (b->type) {
+      case TYPETEXT:
+        return 1;
+
+      case TYPEMESSAGE:
+        return mime_which_token(s, -1) == MIME_DELIVERY_STATUS;
+
+      case TYPEAPPLICATION:
+        return mime_which_token(s, -1) == MIME_PGP_KEYS;
+
+      default:
+        return 0;
+    }
+}
+
+#include "mutt.h"
+
 int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
 {
     char *t;
@@ -213,11 +258,11 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
         *headers++ = '\0';
 
     url_decode(tmp);
-    e->to = rfc822_parse_adrlist (e->to, tmp);
+    e->to = rfc822_parse_adrlist(e->to, tmp);
 
     tag = headers ? strtok (headers, "&") : NULL;
 
-    for (; tag; tag = strtok (NULL, "&")) {
+    for (; tag; tag = strtok(NULL, "&")) {
         if ((value = strchr (tag, '=')))
             *value++ = '\0';
         if (!value || !*value)
@@ -226,19 +271,18 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
         url_decode (tag);
         url_decode (value);
 
-        if (!ascii_strcasecmp (tag, "body")) {
+        if (mime_which_token(tag, -1) == MIME_BODY) {
             if (body)
                 m_strreplace(body, value);
-        }
-        else {
-#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
-            taglen = m_strlen(tag) + m_strlen(SAFEPFX);
+        } else {
+#define SAFEPFX (option(OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+            taglen = m_strlen(tag) + strlen(SAFEPFX);
             /* mutt_parse_rfc822_line makes some assumptions */
-            snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
+            snprintf(scratch, sizeof(scratch), "%s%s: %s", SAFEPFX, tag, value);
 #undef SAVEPFX
             scratch[taglen] = '\0';
             value = vskipspaces(&scratch[taglen + 1]);
-            last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
+            last  = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
             /* if $strict_mailto is set, force editing headers to let
              * users have a look at what we got */
             if (!option (OPTSTRICTMAILTO)) {