/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 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. */
-void unmime_header(gchar *out, const gchar *str)
+gchar *unmime_header(const gchar *encoded_str, gboolean addr_field)
{
- const gchar *p = str;
- gchar *outp = out;
+ const gchar *p = encoded_str;
const gchar *eword_begin_p, *encoding_begin_p, *text_begin_p,
*eword_end_p;
gchar charset[32];
gchar encoding;
gchar *conv_str;
- gint len;
+ 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);
if (!eword_begin_p) {
- strcpy(outp, p);
- return;
+ 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) {
- strcpy(outp, p);
- return;
+ g_string_append(outbuf, p);
+ break;
}
text_begin_p = strchr(encoding_begin_p + 1, '?');
if (!text_begin_p) {
- strcpy(outp, p);
- return;
+ g_string_append(outbuf, p);
+ break;
}
eword_end_p = strstr(text_begin_p + 1, ENCODED_WORD_END);
if (!eword_end_p) {
- strcpy(outp, p);
- return;
+ g_string_append(outbuf, p);
+ break;
}
- if (p == str) {
- memcpy(outp, p, eword_begin_p - p);
- outp += eword_begin_p - p;
+ if (p == encoded_str) {
+ g_string_append_len(outbuf, p, eword_begin_p - p);
p = eword_begin_p;
} else {
/* ignore spaces between encoded words */
const gchar *sp;
for (sp = p; sp < eword_begin_p; sp++) {
- if (!isspace(*(const guchar *)sp)) {
- memcpy(outp, p, eword_begin_p - p);
- outp += eword_begin_p - p;
+ if (!g_ascii_isspace(*sp)) {
+ g_string_append_len
+ (outbuf, p, eword_begin_p - p);
p = eword_begin_p;
break;
}
encoding_begin_p - (eword_begin_p + 2));
memcpy(charset, eword_begin_p + 2, len);
charset[len] = '\0';
- encoding = toupper(*(encoding_begin_p + 1));
+ 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);
(decoded_text, text_begin_p + 1,
eword_end_p - (text_begin_p + 1));
} else {
- memcpy(outp, p, eword_end_p + 2 - p);
- outp += eword_end_p + 2 - p;
+ g_string_append_len(outbuf, p, eword_end_p + 2 - p);
p = eword_end_p + 2;
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) {
- len = strlen(conv_str);
- memcpy(outp, conv_str, len);
+ if (!conv_str || !g_utf8_validate(conv_str, -1, NULL)) {
g_free(conv_str);
- } else {
- len = strlen(decoded_text);
- conv_utf8todisp(outp, len + 1, decoded_text);
+ conv_str = g_malloc(len + 1);
+ conv_utf8todisp(conv_str, len + 1, decoded_text);
}
- outp += len;
+ g_string_append(outbuf, conv_str);
+ g_free(conv_str);
g_free(decoded_text);
p = eword_end_p + 2;
}
+
+ out_str = outbuf->str;
+ out_len = outbuf->len;
+ g_string_free(outbuf, FALSE);
- *outp = '\0';
+ return g_realloc(out_str, out_len + 1);
}
projects / claws.git / blobdiff