2005-09-18 [colin] 1.9.14cvs39

[claws.git] / src / procmime.c

diff --git a/src/procmime.c b/src/procmime.c
index d4da691f34de88b05fe3e1fd31639c561d536f30..a9f1a4d4887f9ec8002c1f06f33fc531b803ea79 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -102,7 +102,7 @@ static gboolean free_func(GNode *node, gpointer data)
        switch (mimeinfo->content) {
        case MIMECONTENT_FILE:
                if (mimeinfo->tmp)
-                       unlink(mimeinfo->data.filename);
+                       g_unlink(mimeinfo->data.filename);
                g_free(mimeinfo->data.filename);
                break;
 
@@ -237,8 +237,8 @@ MimeInfo *procmime_scan_message(MsgInfo *msginfo)
        if (!filename || !is_file_exist(filename)) 
                return NULL;
 
-       if (msginfo->folder->stype != F_QUEUE && 
-           msginfo->folder->stype != F_DRAFT)
+       if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+           !folder_has_parent_of_type(msginfo->folder, F_DRAFT))
                mimeinfo = procmime_scan_file(filename);
        else
                mimeinfo = procmime_scan_queue_file(filename);
@@ -289,7 +289,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
            encoding == ENC_BINARY)
                return TRUE;
 
-       infp = fopen(mimeinfo->data.filename, "rb");
+       infp = g_fopen(mimeinfo->data.filename, "rb");
        if (!infp) {
                perror("fopen");
                return FALSE;
@@ -387,7 +387,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
 
        stat(tmpfilename, &statbuf);
        if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
-               unlink(mimeinfo->data.filename);
+               g_unlink(mimeinfo->data.filename);
        if (mimeinfo->data.filename != NULL)
                g_free(mimeinfo->data.filename);
        mimeinfo->data.filename = tmpfilename;
@@ -409,6 +409,9 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
        gchar *tmpfilename;
        struct stat statbuf;
 
+       if (mimeinfo->content == MIMECONTENT_EMPTY)
+               return TRUE;
+
        if (mimeinfo->encoding_type != ENC_UNKNOWN &&
            mimeinfo->encoding_type != ENC_BINARY &&
            mimeinfo->encoding_type != ENC_7BIT &&
@@ -423,7 +426,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
        }
 
        if (mimeinfo->content == MIMECONTENT_FILE) {
-               if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+               if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                        g_warning("Can't open file %s\n", mimeinfo->data.filename);
                        return FALSE;
                }
@@ -447,9 +450,9 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                                        fclose(infp);
                                        return FALSE;
                                }
-                               if ((tmp_fp = fopen(tmp_file, "rb")) == NULL) {
+                               if ((tmp_fp = g_fopen(tmp_file, "rb")) == NULL) {
                                        FILE_OP_ERROR(tmp_file, "fopen");
-                                       unlink(tmp_file);
+                                       g_unlink(tmp_file);
                                        g_free(tmp_file);
                                        fclose(infp);
                                        return FALSE;
@@ -480,7 +483,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
 
                if (tmp_file) {
                        fclose(tmp_fp);
-                       unlink(tmp_file);
+                       g_unlink(tmp_file);
                        g_free(tmp_file);
                }
        } else if (encoding == ENC_QUOTED_PRINTABLE) {
@@ -513,7 +516,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
 
        if (mimeinfo->content == MIMECONTENT_FILE) {
                if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
-                       unlink(mimeinfo->data.filename);
+                       g_unlink(mimeinfo->data.filename);
                g_free(mimeinfo->data.filename);
        } else if (mimeinfo->content == MIMECONTENT_MEM) {
                if (mimeinfo->tmp && (mimeinfo->data.mem != NULL))
@@ -543,7 +546,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
                return -1;
 
-       if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+       if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                return -1;
        }
@@ -552,7 +555,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
                fclose(infp);
                return -1;
        }
-       if ((outfp = fopen(outfile, "wb")) == NULL) {
+       if ((outfp = g_fopen(outfile, "wb")) == NULL) {
                FILE_OP_ERROR(outfile, "fopen");
                fclose(infp);
                return -1;
@@ -568,7 +571,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        fclose(infp);
        if (fclose(outfp) == EOF) {
                FILE_OP_ERROR(outfile, "fclose");
-               unlink(outfile);
+               g_unlink(outfile);
                return -1;
        }
 
@@ -614,7 +617,7 @@ void renderer_read_config(void)
        renderer_list = NULL;
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
-       f = fopen(rcpath, "rb");
+       f = g_fopen(rcpath, "rb");
        g_free(rcpath);
        
        if (f == NULL)
@@ -694,7 +697,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
                return NULL;
        }
 
-       tmpfp = fopen(tmpfile, "rb");
+       tmpfp = g_fopen(tmpfile, "rb");
        if (tmpfp == NULL) {
                g_free(tmpfile);
                return NULL;
@@ -733,7 +736,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
                oldout = dup(1);
                
                dup2(fileno(outfp), 1);
-               
+
                p = popen(renderer->renderer, "w");
                if (p != NULL) {
                        size_t count;
@@ -787,7 +790,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
 
        fclose(tmpfp);
        rewind(outfp);
-       unlink(tmpfile);
+       g_unlink(tmpfile);
        g_free(tmpfile);
 
        return outfp;
@@ -1097,10 +1100,10 @@ GList *procmime_get_mime_type_list(void)
        if (mime_type_list) 
                return mime_type_list;
        
-       if ((fp = fopen("/usr/share/mime/globs", "rb")) == NULL) {
+       if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL) {
                fp_is_glob_file = FALSE;
-               if ((fp = fopen("/etc/mime.types", "rb")) == NULL) {
-                       if ((fp = fopen(SYSCONFDIR "/mime.types", "rb")) 
+               if ((fp = g_fopen("/etc/mime.types", "rb")) == NULL) {
+                       if ((fp = g_fopen(SYSCONFDIR "/mime.types", "rb")) 
                                == NULL) {
                                FILE_OP_ERROR(SYSCONFDIR "/mime.types", 
                                        "fopen");
@@ -1182,7 +1185,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file)
        size_t total_len = 0;
        gfloat octet_percentage;
 
-       if ((fp = fopen(file, "rb")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return ENC_UNKNOWN;
        }
@@ -1333,7 +1336,7 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
 
        procmime_decode_content(mimeinfo);
 
-       fp = fopen(mimeinfo->data.filename, "rb");
+       fp = g_fopen(mimeinfo->data.filename, "rb");
        if (fp == NULL) {
                FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                return;
@@ -1397,7 +1400,7 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
 
        procmime_decode_content(mimeinfo);
 
-       fp = fopen(mimeinfo->data.filename, "rb");
+       fp = g_fopen(mimeinfo->data.filename, "rb");
        if (fp == NULL) {
                FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                return;
@@ -1568,7 +1571,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                gchar *charset, *lang, *oldvalue, *newvalue;
 
                attribute = (gchar *) cur->data;
-               if (!g_hash_table_lookup_extended(table, attribute, (gpointer *) &key, (gpointer *) &value))
+               if (!g_hash_table_lookup_extended(
+                       table, attribute, (gpointer *)(gchar *) &key, (gpointer *)(gchar *) &value))
                        continue;
 
                charset = value;
@@ -1608,10 +1612,16 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
                mimeinfo->type = MIMETYPE_TEXT;
                mimeinfo->subtype = g_strdup("plain");
                if (g_hash_table_lookup(mimeinfo->typeparameters,
-                                      "charset") == NULL)
-                       g_hash_table_insert(mimeinfo->typeparameters,
+                                      "charset") == NULL) {
+                       if (strcmp(conv_get_locale_charset_str(), CS_UTF_8))
+                               g_hash_table_insert(mimeinfo->typeparameters,
                                            g_strdup("charset"),
-                                           g_strdup("us-ascii"));
+                                           g_strdup(conv_get_locale_charset_str()));
+                       else
+                               g_hash_table_insert(mimeinfo->typeparameters,
+                                           g_strdup("charset"),
+                                           g_strdup(CS_ISO_8859_1));
+               }
        } else {
                gchar *type, *subtype, *params;
 
@@ -1712,8 +1722,16 @@ int procmime_parse_mimepart(MimeInfo *parent,
                mimeinfo->type = MIMETYPE_TEXT;
                mimeinfo->subtype = g_strdup("plain");
                if (g_hash_table_lookup(mimeinfo->typeparameters,
-                                      "charset") == NULL)
-                       g_hash_table_insert(mimeinfo->typeparameters, g_strdup("charset"), g_strdup("us-ascii"));
+                                      "charset") == NULL) {
+                       if (strcmp(conv_get_locale_charset_str(), CS_UTF_8))
+                               g_hash_table_insert(mimeinfo->typeparameters,
+                                           g_strdup("charset"),
+                                           g_strdup(conv_get_locale_charset_str()));
+                       else
+                               g_hash_table_insert(mimeinfo->typeparameters,
+                                           g_strdup("charset"),
+                                           g_strdup(CS_ISO_8859_1));
+               }
        }
 
        if (content_encoding != NULL) {
@@ -1829,7 +1847,7 @@ MimeInfo *procmime_scan_queue_file(const gchar *filename)
        g_return_val_if_fail(filename != NULL, NULL);
 
        /* Open file */
-       if ((fp = fopen(filename, "rb")) == NULL)
+       if ((fp = g_fopen(filename, "rb")) == NULL)
                return NULL;
        /* Skip queue header */
        while (fgets(buf, sizeof(buf), fp) != NULL)
@@ -1846,24 +1864,26 @@ typedef enum {
     ENC_AS_TOKEN,
     ENC_AS_QUOTED_STRING,
     ENC_AS_EXTENDED,
+    ENC_TO_ASCII,
 } EncodeAs;
 
 typedef struct _ParametersData {
        FILE *fp;
        guint len;
+       guint ascii_only;
 } ParametersData;
 
 static void write_parameters(gpointer key, gpointer value, gpointer user_data)
 {
        gchar *param = key;
-       gchar *val = value, *valpos;
+       gchar *val = value, *valpos, *tmp;
        ParametersData *pdata = (ParametersData *)user_data;
        GString *buf = g_string_new("");
 
        EncodeAs encas = ENC_AS_TOKEN;
 
        for (valpos = val; *valpos != 0; valpos++) {
-               if (!IS_ASCII(*valpos)) {
+               if (!IS_ASCII(*valpos) || *valpos == '"') {
                        encas = ENC_AS_EXTENDED;
                        break;
                }
@@ -1886,7 +1906,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                case ';':
                case ':':
                case '\\':
-               case '"':
+               case '\'':
                case '/':
                case '[':
                case ']':
@@ -1896,12 +1916,26 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                        continue;
                }
        }
+       
+       if (encas == ENC_AS_EXTENDED && pdata->ascii_only == TRUE) 
+               encas = ENC_TO_ASCII;
 
        switch (encas) {
        case ENC_AS_TOKEN:
                g_string_append_printf(buf, "%s=%s", param, val);
                break;
 
+       case ENC_TO_ASCII:
+               tmp = g_strdup(val);
+               g_strcanon(tmp, 
+                       " ()<>@,';:\\/[]?=.0123456789"
+                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                       "abcdefghijklmnopqrstuvwxyz",
+                       '_');
+               g_string_append_printf(buf, "%s=\"%s\"", param, tmp);
+               g_free(tmp);
+               break;
+
        case ENC_AS_QUOTED_STRING:
                g_string_append_printf(buf, "%s=\"%s\"", param, val);
                break;
@@ -1922,7 +1956,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                                g_string_append_printf(buf, "%%%s", hexstr);
                        }
                }
-               break;
+               break;          
        }
        
        if (buf->str && strlen(buf->str)) {
@@ -1944,6 +1978,7 @@ void procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
        debug_print("procmime_write_mime_header\n");
        
        pdata->fp = fp;
+       pdata->ascii_only = FALSE;
 
        for (type_table = mime_type_table; type_table->str != NULL; type_table++)
                if (mimeinfo->type == type_table->type) {
@@ -1951,6 +1986,7 @@ void procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
                                "Content-Type: %s/%s", type_table->str, mimeinfo->subtype);
                        fprintf(fp, "%s", buf);
                        pdata->len = strlen(buf);
+                       pdata->ascii_only = TRUE;
                        g_free(buf);
                        break;
                }
@@ -1983,6 +2019,8 @@ void procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
                g_free(buf);
 
                pdata->fp = fp;
+               pdata->ascii_only = FALSE;
+
                g_hash_table_foreach(mimeinfo->dispositionparameters, write_parameters, pdata);
                g_free(pdata);
                fprintf(fp, "\n");
@@ -2004,7 +2042,7 @@ gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
        /* write header */
        switch (mimeinfo->content) {
        case MIMECONTENT_FILE:
-               if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+               if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                        FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                        return -1;
                }
@@ -2064,7 +2102,7 @@ gint procmime_write_multipart(MimeInfo *mimeinfo, FILE *fp)
 
        switch (mimeinfo->content) {
        case MIMECONTENT_FILE:
-               if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+               if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                        FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                        return -1;
                }
@@ -2121,7 +2159,7 @@ gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp)
        if (G_NODE_IS_LEAF(mimeinfo->node)) {
                switch (mimeinfo->content) {
                case MIMECONTENT_FILE:
-                       if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+                       if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                                FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                                return -1;
                        }
@@ -2143,8 +2181,9 @@ gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp)
                /* Call writer for mime type */
                switch (mimeinfo->type) {
                case MIMETYPE_MESSAGE:
-                       if (g_ascii_strcasecmp(mimeinfo->subtype, "rfc822") == 0)
+                       if (g_ascii_strcasecmp(mimeinfo->subtype, "rfc822") == 0) {
                                return procmime_write_message_rfc822(mimeinfo, fp);
+                       }
                        break;
                        
                case MIMETYPE_MULTIPART: