ctors/dtors for BODY's

[apps/madmutt.git] / lib-mime / mime.c

diff --git a/lib-mime/mime.c b/lib-mime/mime.c
index 3a8a9ed..212c24d 100644 (file)
--- a/lib-mime/mime.c
+++ b/lib-mime/mime.c
@@ -20,10 +20,12 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/url.h>
 
-#include "mime-types.h"
+#include "mime.h"
 
 #include "mutt.h"
 
+#define BOUNDARYLEN 16
+
 const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t";
 
 const char *BodyTypes[] = {
@@ -48,6 +50,90 @@ const char *BodyEncodings[] = {
     "x-uuencoded",
 };
 
+/****************************************************************************/
+/* rfc822 header parameters                                                 */
+/****************************************************************************/
+
+char *parameter_getval(parameter_t *parm, const char *s)
+{
+    while (parm) {
+        if (!ascii_strcasecmp(parm->attribute, s))
+            return parm->value;
+        parm = parm->next;
+    }
+    return NULL;
+}
+
+void parameter_setval(parameter_t **p, const char *attribute, const char *value)
+{
+    while (*p) {
+        if (!ascii_strcasecmp(attribute, (*p)->attribute)) {
+            if (value) {
+                m_strreplace(&(*p)->value, value);
+            } else {
+                parameter_t *q = parameter_list_pop(p);
+                parameter_delete(&q);
+            }
+            return;
+        }
+        p = &(*p)->next;
+    }
+
+    if (value) {
+        (*p) = parameter_new();
+        (*p)->attribute = m_strdup(attribute);
+        (*p)->value = m_strdup(value);
+    }
+}
+
+void parameter_delval(parameter_t **p, const char *attribute)
+{
+    while (*p) {
+        if (!ascii_strcasecmp(attribute, (*p)->attribute)) {
+            parameter_t *q = parameter_list_pop(p);
+            parameter_delete(&q);
+            return;
+        }
+
+        p = &(*p)->next;
+    }
+}
+
+int parameter_equal(const parameter_t *p1, const parameter_t *p2)
+{
+    while (p1 && p2) {
+        if (m_strcmp(p1->attribute, p2->attribute)
+        ||  m_strcmp(p1->value, p2->value))
+            return 0;
+
+        p1 = p1->next;
+        p2 = p2->next;
+    }
+
+    if (p1 || p2)
+        return 0;
+
+    return 1;
+}
+
+void parameter_set_boundary(parameter_t **parm)
+{
+    char rs[BOUNDARYLEN + 1];
+    int i;
+
+    for (i = 0; i < BOUNDARYLEN; i++) {
+        rs[i] = __m_b64chars[lrand48() % sizeof(__m_b64chars)];
+    }
+    rs[BOUNDARYLEN] = '\0';
+
+    parameter_setval(parm, "boundary", rs);
+}
+
+
+/****************************************************************************/
+/* XXX                                                                      */
+/****************************************************************************/
+
 void rfc1524_entry_wipe(rfc1524_entry *p)
 {
     p_delete(&p->command);
@@ -92,10 +178,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);