/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
#include <string.h>
#include <ctype.h>
+#include "utils.h"
#include "codeconv.h"
-#include "base64.h"
#include "quoted-printable.h"
#define ENCODED_WORD_BEGIN "=?"
/* Decodes headers based on RFC2045 and RFC2047. */
-gchar *unmime_header(const gchar *encoded_str)
+gchar *unmime_header(const gchar *encoded_str, gboolean addr_field)
{
const gchar *p = encoded_str;
const gchar *eword_begin_p, *encoding_begin_p, *text_begin_p,
GString *outbuf;
gchar *out_str;
gsize out_len;
+ int in_quote = FALSE;
outbuf = g_string_sized_new(strlen(encoded_str) * 2);
while (*p != '\0') {
gchar *decoded_text = NULL;
+ const gchar *quote_p;
gint len;
eword_begin_p = strstr(p, ENCODED_WORD_BEGIN);
g_string_append(outbuf, p);
break;
}
+
+ quote_p = p;
+ while ((quote_p = strchr(quote_p, '"')) != NULL) {
+ if (quote_p && quote_p < eword_begin_p) {
+ /* Found a quote before the encoded word. */
+ in_quote = !in_quote;
+ quote_p++;
+ }
+ if (quote_p >= eword_begin_p)
+ break;
+ }
+
encoding_begin_p = strchr(eword_begin_p + 2, '?');
if (!encoding_begin_p) {
g_string_append(outbuf, p);
encoding = g_ascii_toupper(*(encoding_begin_p + 1));
if (encoding == 'B') {
- decoded_text = g_malloc
- (eword_end_p - (text_begin_p + 1) + 1);
- len = base64_decode(decoded_text, text_begin_p + 1,
- eword_end_p - (text_begin_p + 1));
- decoded_text[len] = '\0';
+ gchar *tmp;
+ tmp = g_strndup(text_begin_p + 1, eword_end_p - (text_begin_p + 1) + 1);
+ decoded_text = g_base64_decode(tmp, &out_len);
+ g_free(tmp);
} else if (encoding == 'Q') {
decoded_text = g_malloc
(eword_end_p - (text_begin_p + 1) + 1);
continue;
}
+ /* An encoded word MUST not appear within a quoted string,
+ * so quoting that word after decoding should be safe.
+ * We check there are no quotes just to be sure. If there
+ * are, well, the comma won't pose a problem, probably.
+ */
+ if (addr_field && strchr(decoded_text, ',') && !in_quote &&
+ !strchr(decoded_text, '"')) {
+ gchar *tmp = g_strdup_printf("\"%s\"", decoded_text);
+ g_free(decoded_text);
+ decoded_text = tmp;
+ }
+
/* convert to UTF-8 */
conv_str = conv_codeset_strdup(decoded_text, charset, NULL);
if (!conv_str || !g_utf8_validate(conv_str, -1, NULL)) {