0.9.7claws7

[claws.git] / src / procmime.c

diff --git a/src/procmime.c b/src/procmime.c
index cbce54dc5de23d27b3e6ce3025dece1b3de080ef..c2814d699b0e1de84401a2bce76b7bc7b6f923de 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -56,6 +56,7 @@ MimeInfo *procmime_mimeinfo_new(void)
        mimeinfo = g_new0(MimeInfo, 1);
        mimeinfo->type          = MIMETYPE_UNKNOWN;
        mimeinfo->encoding_type = ENC_UNKNOWN;
+       mimeinfo->disposition   = DISPOSITIONTYPE_UNKNOWN;
 
        mimeinfo->parameters = g_hash_table_new(g_str_hash, g_str_equal);
        mimeinfo->node       = g_node_new(mimeinfo);
@@ -75,9 +76,6 @@ static gboolean free_func(GNode *node, gpointer data)
 {
        MimeInfo *mimeinfo = (MimeInfo *) node->data;
 
-       g_free(mimeinfo->encoding);
-       g_free(mimeinfo->name);
-       g_free(mimeinfo->content_disposition);
        if(mimeinfo->tmpfile)
                unlink(mimeinfo->filename);
        g_free(mimeinfo->filename);
@@ -678,8 +676,14 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
        if ((mimeinfo->type == MIMETYPE_TEXT) && !g_strcasecmp(mimeinfo->subtype, "html"))
                base = "mimetmp.html";
        else {
-               base = mimeinfo->name ? mimeinfo->name : "mimetmp";
-               base = g_basename(base);
+               const gchar *basetmp;
+
+               basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
+               if (basetmp == NULL)
+                       basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "name");
+               if (basetmp == NULL)
+                       basetmp = "mimetmp";
+               base = g_basename(basetmp);
                if (*base == '\0') base = "mimetmp";
                Xstrdup_a(base, base, return NULL);
                subst_for_filename(base);
@@ -942,6 +946,7 @@ void procmime_parse_mimepart(MimeInfo *parent,
                             gchar *content_encoding,
                             gchar *content_description,
                             gchar *content_id,
+                            gchar *content_disposition,
                             const gchar *filename,
                             guint offset,
                             guint length);
@@ -955,6 +960,8 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                                                   NULL, TRUE},
                                {"Content-ID:",
                                                   NULL, TRUE},
+                               {"Content-Disposition:",
+                                                  NULL, TRUE},
                                {NULL,             NULL, FALSE}};
        guint content_start, i;
        FILE *fp;
@@ -973,9 +980,10 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
        procmime_parse_mimepart(mimeinfo,
                                hentry[0].body, hentry[1].body,
                                hentry[2].body, hentry[3].body, 
+                               hentry[4].body, 
                                mimeinfo->filename, content_start,
                                mimeinfo->length - (content_start - mimeinfo->offset));
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;
        }
@@ -990,6 +998,8 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
                                                   NULL, TRUE},
                                {"Content-ID:",
                                                   NULL, TRUE},
+                               {"Content-Disposition:",
+                                                  NULL, TRUE},
                                {NULL,             NULL, FALSE}};
        gchar *p;
        gchar *boundary;
@@ -1018,6 +1028,7 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
                                procmime_parse_mimepart(mimeinfo,
                                                        hentry[0].body, hentry[1].body,
                                                        hentry[2].body, hentry[3].body, 
+                                                       hentry[4].body, 
                                                        mimeinfo->filename, lastoffset,
                                                        (ftell(fp) - strlen(buf)) - lastoffset);
                        }
@@ -1026,7 +1037,7 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
                            buf[2 + boundary_len + 1] == '-')
                                break;
 
-                       for (i = 0; i < 4; i++) {
+                       for (i = 0; i < (sizeof hentry / sizeof hentry[0]) ; i++) {
                                g_free(hentry[i].body);
                                hentry[i].body = NULL;
                        }
@@ -1034,13 +1045,41 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
                        lastoffset = ftell(fp);
                }
        }
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;
        }
        fclose(fp);
 }
 
+static void add_to_mimeinfo_parameters(gchar **parts, MimeInfo *mimeinfo)
+{
+       gchar **strarray;
+
+       for (strarray = parts; *strarray != NULL; strarray++) {
+               gchar **parameters_parts;
+
+               parameters_parts = g_strsplit(*strarray, "=", 1);
+               if ((parameters_parts[0] != NULL) && (parameters_parts[1] != NULL)) {
+                       gchar *firstspace;
+
+                       g_strstrip(parameters_parts[0]);
+                       g_strstrip(parameters_parts[1]);
+                       g_strdown(parameters_parts[0]);
+                       if(parameters_parts[1][0] == '"')
+                               extract_quote(parameters_parts[1], '"');
+                       else if ((firstspace = strchr(parameters_parts[1], ' ')) != NULL)
+                               *firstspace = '\0';
+                       if(g_hash_table_lookup(mimeinfo->parameters,
+                                              parameters_parts[0]) == NULL)
+                               g_hash_table_insert(mimeinfo->parameters,
+                                                   g_strdup(parameters_parts[0]),
+                                                   g_strdup(parameters_parts[1]));
+               }
+               g_strfreev(parameters_parts);
+       }
+}      
+
 static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
 {
        gchar **content_type_parts;
@@ -1075,25 +1114,43 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
        }
 
        /* Get mimeinfo->parmeters */
-       for (strarray = &content_type_parts[1]; *strarray != NULL; strarray++) {
-               gchar **parameters_parts;
+       add_to_mimeinfo_parameters(&content_type_parts[1], mimeinfo);
+       g_strfreev(content_type_parts);
+}
 
-               parameters_parts = g_strsplit(*strarray, "=", 1);
-               if ((parameters_parts[0] != NULL) && (parameters_parts[1] != NULL)) {
-                       g_strdown(parameters_parts[0]);
-                       if(parameters_parts[1][0] == '"')
-                               extract_quote(parameters_parts[1], '"');
+static void procmime_parse_content_disposition(const gchar *content_disposition, MimeInfo *mimeinfo)
+{
+       gchar **content_disp_parts;
+       gchar **strarray;
+       gchar *str;
 
-                       g_hash_table_insert(mimeinfo->parameters,
-                                           g_strdup(parameters_parts[0]),
-                                           g_strdup(parameters_parts[1]));
-               }
-               g_strfreev(parameters_parts);
-       }
+       g_return_if_fail(content_disposition != NULL);
+       g_return_if_fail(mimeinfo != NULL);
 
-       g_strfreev(content_type_parts);
+       /* Split into parts and remove trailing
+          and leading whitespaces from all strings */
+       content_disp_parts = g_strsplit(content_disposition, ";", 0);
+       for (strarray = content_disp_parts; *strarray != NULL; strarray++) {
+               g_strstrip(*strarray);
+       }
+       /* Get mimeinfo->disposition */
+       str = content_disp_parts[0];
+       if (str == NULL) {
+               g_strfreev(content_disp_parts);
+               return;
+       }
+       if (!g_strcasecmp(str, "inline")) 
+               mimeinfo->disposition = DISPOSITIONTYPE_INLINE;
+       else if (!g_strcasecmp(str, "attachment"))
+               mimeinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
+       else
+               mimeinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
+       
+       add_to_mimeinfo_parameters(&content_disp_parts[1], mimeinfo);
+       g_strfreev(content_disp_parts);
 }
 
+
 static void procmime_parse_content_encoding(const gchar *content_encoding, MimeInfo *mimeinfo)
 {
        struct EncodingTable *enc_table;
@@ -1113,6 +1170,7 @@ void procmime_parse_mimepart(MimeInfo *parent,
                             gchar *content_encoding,
                             gchar *content_description,
                             gchar *content_id,
+                            gchar *content_disposition,
                             const gchar *filename,
                             guint offset,
                             guint length)
@@ -1151,6 +1209,11 @@ void procmime_parse_mimepart(MimeInfo *parent,
        else
                mimeinfo->id = NULL;
 
+       if (content_disposition != NULL) 
+               procmime_parse_content_disposition(content_disposition, mimeinfo);
+       else
+               mimeinfo->disposition = DISPOSITIONTYPE_UNKNOWN;
+
        /* Call parser for mime type */
        switch (mimeinfo->type) {
                case MIMETYPE_MESSAGE: