/*
* 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 "defs.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <string.h>
# include <locale.h>
#endif
-#include <iconv.h>
-
#include "codeconv.h"
#include "unmime.h"
-#include "base64.h"
#include "quoted-printable.h"
#include "utils.h"
#include "prefs_common.h"
+/* For unknown reasons the inconv.m4 macro undefs that macro if no
+ const is needed. This would break the code below so we define it. */
+#ifndef ICONV_CONST
+#define ICONV_CONST
+#endif
+
typedef enum
{
JIS_ASCII,
state = JIS_AUXKANJI; \
}
-static void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
+static CodeConvFunc conv_get_code_conv_func (const gchar *src_charset_str,
+ const gchar *dest_charset_str);
+
+static gchar *conv_iconv_strdup_with_cd (const gchar *inbuf,
+ iconv_t cd);
+
+static gchar *conv_iconv_strdup (const gchar *inbuf,
+ const gchar *src_code,
+ const gchar *dest_code);
+
+static CharSet conv_get_locale_charset (void);
+static CharSet conv_get_outgoing_charset (void);
+static CharSet conv_guess_ja_encoding(const gchar *str);
+static gboolean conv_is_ja_locale (void);
+
+static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_utf8tojis(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_utf8tojis(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_unreadable_eucjp(gchar *str);
static void conv_unreadable_8bit(gchar *str);
-static void conv_unreadable_latin(gchar *str);
-static void conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
+static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf);
-static void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gboolean strict_mode = FALSE;
+
+void codeconv_set_strict(gboolean mode)
+{
+ strict_mode = mode;
+}
+
+static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
- guchar *out = outbuf;
+ gchar *out = outbuf;
JISState state = JIS_ASCII;
- while (*in != '\0') {
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ /*
+ * Loop outputs up to 3 bytes in each pass (aux kanji) and we
+ * need 1 byte to terminate the output
+ */
+ while (*in != '\0' && (out - outbuf) < outlen - 4) {
if (*in == ESC) {
in++;
if (*in == '$') {
}
*out = '\0';
+ return 0;
}
#define JIS_HWDAKUTEN 0x5e
guint16 out_code;
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
jis_code &= 0x7f;
sound_sym &= 0x7f;
return 1;
}
-static void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
- guchar *out = outbuf;
+ gchar *out = outbuf;
JISState state = JIS_ASCII;
- while (*in != '\0') {
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ /*
+ * Loop outputs up to 6 bytes in each pass (aux shift + aux
+ * kanji) and we need up to 4 bytes to terminate the output
+ * (ASCII shift + null)
+ */
+ while (*in != '\0' && (out - outbuf) < outlen - 10) {
if (IS_ASCII(*in)) {
K_OUT();
*out++ = *in++;
K_OUT();
*out = '\0';
+ return 0;
}
-static void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
- guchar *out = outbuf;
+ gchar *out = outbuf;
+
+ cm_return_val_if_fail(outbuf != NULL, 0);
- while (*in != '\0') {
+ /*
+ * Loop outputs up to 2 bytes in each pass and we need 1 byte
+ * to terminate the output
+ */
+ while (*in != '\0' && (out - outbuf) < outlen - 3) {
if (IS_ASCII(*in)) {
*out++ = *in++;
} else if (issjiskanji1(*in)) {
}
*out = '\0';
+ return 0;
}
-static void conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *eucstr;
- Xalloca(eucstr, outlen, return);
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ Xalloca(eucstr, outlen, return -1);
- conv_jistoeuc(eucstr, outlen, inbuf);
- conv_euctoutf8(outbuf, outlen, eucstr);
+ if (conv_jistoeuc(eucstr, outlen, inbuf) <0)
+ return -1;
+ if (conv_euctoutf8(outbuf, outlen, eucstr) < 0)
+ return -1;
+ return 0;
}
-static void conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
tmpstr = conv_iconv_strdup(inbuf, CS_SHIFT_JIS, CS_UTF_8);
if (tmpstr) {
strncpy2(outbuf, tmpstr, outlen);
g_free(tmpstr);
- } else
+ return 0;
+ } else {
strncpy2(outbuf, inbuf, outlen);
+ return -1;
+ }
}
-static void conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
static iconv_t cd = (iconv_t)-1;
static gboolean iconv_ok = TRUE;
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
if (cd == (iconv_t)-1) {
if (!iconv_ok) {
strncpy2(outbuf, inbuf, outlen);
- return;
+ return -1;
}
cd = iconv_open(CS_UTF_8, CS_EUC_JP_MS);
if (cd == (iconv_t)-1) {
cd = iconv_open(CS_UTF_8, CS_EUC_JP);
if (cd == (iconv_t)-1) {
- g_warning("conv_euctoutf8(): %s\n",
+ g_warning("conv_euctoutf8(): %s",
g_strerror(errno));
iconv_ok = FALSE;
strncpy2(outbuf, inbuf, outlen);
- return;
+ return -1;
}
}
}
if (tmpstr) {
strncpy2(outbuf, tmpstr, outlen);
g_free(tmpstr);
- } else
+ return 0;
+ } else {
strncpy2(outbuf, inbuf, outlen);
+ return -1;
+ }
}
-static void conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ gint r = -1;
+
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
switch (conv_guess_ja_encoding(inbuf)) {
case C_ISO_2022_JP:
- conv_jistoutf8(outbuf, outlen, inbuf);
+ r = conv_jistoutf8(outbuf, outlen, inbuf);
break;
case C_SHIFT_JIS:
- conv_sjistoutf8(outbuf, outlen, inbuf);
+ r = conv_sjistoutf8(outbuf, outlen, inbuf);
break;
case C_EUC_JP:
- conv_euctoutf8(outbuf, outlen, inbuf);
+ r = conv_euctoutf8(outbuf, outlen, inbuf);
break;
default:
+ r = 0;
strncpy2(outbuf, inbuf, outlen);
break;
}
+
+ return r;
}
-static void conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
static iconv_t cd = (iconv_t)-1;
static gboolean iconv_ok = TRUE;
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
if (cd == (iconv_t)-1) {
if (!iconv_ok) {
strncpy2(outbuf, inbuf, outlen);
- return;
+ return -1;
}
cd = iconv_open(CS_EUC_JP_MS, CS_UTF_8);
if (cd == (iconv_t)-1) {
cd = iconv_open(CS_EUC_JP, CS_UTF_8);
if (cd == (iconv_t)-1) {
- g_warning("conv_utf8toeuc(): %s\n",
+ g_warning("conv_utf8toeuc(): %s",
g_strerror(errno));
iconv_ok = FALSE;
strncpy2(outbuf, inbuf, outlen);
- return;
+ return -1;
}
}
}
if (tmpstr) {
strncpy2(outbuf, tmpstr, outlen);
g_free(tmpstr);
- } else
+ return 0;
+ } else {
strncpy2(outbuf, inbuf, outlen);
+ return -1;
+ }
}
-static void conv_utf8tojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_utf8tojis(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *eucstr;
- Xalloca(eucstr, outlen, return);
-
- conv_utf8toeuc(eucstr, outlen, inbuf);
- conv_euctojis(outbuf, outlen, eucstr);
-}
-
-static gchar valid_eucjp_tbl[][96] = {
- /* 0xa2a0 - 0xa2ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0 },
-
- /* 0xa3a0 - 0xa3ff */
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 },
-
- /* 0xa4a0 - 0xa4ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-
- /* 0xa5a0 - 0xa5ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-
- /* 0xa6a0 - 0xa6ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-
- /* 0xa7a0 - 0xa7ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-
- /* 0xa8a0 - 0xa8ff */
- { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-};
-
-static gboolean isprintableeuckanji(guchar c1, guchar c2)
-{
- if (c1 <= 0xa0 || c1 >= 0xf5)
- return FALSE;
- if (c2 <= 0xa0 || c2 == 0xff)
- return FALSE;
-
- if (c1 >= 0xa9 && c1 <= 0xaf)
- return FALSE;
-
- if (c1 >= 0xa2 && c1 <= 0xa8)
- return (gboolean)valid_eucjp_tbl[c1 - 0xa2][c2 - 0xa0];
-
- if (c1 == 0xcf) {
- if (c2 >= 0xd4 && c2 <= 0xfe)
- return FALSE;
- } else if (c1 == 0xf4) {
- if (c2 >= 0xa7 && c2 <= 0xfe)
- return FALSE;
- }
-
- return TRUE;
-}
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
-static void conv_unreadable_eucjp(gchar *str)
-{
- register guchar *p = str;
+ Xalloca(eucstr, outlen, return -1);
- while (*p != '\0') {
- if (IS_ASCII(*p)) {
- /* convert CR+LF -> LF */
- if (*p == '\r' && *(p + 1) == '\n')
- memmove(p, p + 1, strlen(p));
- /* printable 7 bit code */
- p++;
- } else if (iseuckanji(*p)) {
- if (isprintableeuckanji(*p, *(p + 1))) {
- /* printable euc-jp code */
- p += 2;
- } else {
- /* substitute unprintable code */
- *p++ = SUBST_CHAR;
- if (*p != '\0') {
- if (IS_ASCII(*p))
- p++;
- else
- *p++ = SUBST_CHAR;
- }
- }
- } else if (iseuchwkana1(*p)) {
- if (iseuchwkana2(*(p + 1)))
- /* euc-jp hankaku kana */
- p += 2;
- else
- *p++ = SUBST_CHAR;
- } else if (iseucaux(*p)) {
- if (iseuckanji(*(p + 1)) && iseuckanji(*(p + 2))) {
- /* auxiliary kanji */
- p += 3;
- } else
- *p++ = SUBST_CHAR;
- } else
- /* substitute unprintable 1 byte code */
- *p++ = SUBST_CHAR;
- }
+ if (conv_utf8toeuc(eucstr, outlen, inbuf) < 0)
+ return -1;
+ if (conv_euctojis(outbuf, outlen, eucstr) < 0)
+ return -1;
+
+ return 0;
}
static void conv_unreadable_8bit(gchar *str)
}
}
-static void conv_unreadable_latin(gchar *str)
-{
- register guchar *p = str;
-
- while (*p != '\0') {
- /* convert CR+LF -> LF */
- if (*p == '\r' && *(p + 1) == '\n')
- memmove(p, p + 1, strlen(p));
- else if ((*p & 0xff) >= 0x7f)
- *p = SUBST_CHAR;
- p++;
- }
-}
-
-#define NCV '\0'
-
-void conv_mb_alnum(gchar *str)
-{
- static guchar char_tbl[] = {
- /* 0xa0 - 0xaf */
- NCV, ' ', NCV, NCV, ',', '.', NCV, ':',
- ';', '?', '!', NCV, NCV, NCV, NCV, NCV,
- /* 0xb0 - 0xbf */
- NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
- NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
- /* 0xc0 - 0xcf */
- NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
- NCV, NCV, '(', ')', NCV, NCV, '[', ']',
- /* 0xd0 - 0xdf */
- '{', '}', NCV, NCV, NCV, NCV, NCV, NCV,
- NCV, NCV, NCV, NCV, '+', '-', NCV, NCV,
- /* 0xe0 - 0xef */
- NCV, '=', NCV, '<', '>', NCV, NCV, NCV,
- NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV
- };
-
- register guchar *p = str;
- register gint len;
-
- len = strlen(str);
-
- while (len > 1) {
- if (*p == 0xa3) {
- register guchar ch = *(p + 1);
-
- if (ch >= 0xb0 && ch <= 0xfa) {
- /* [a-zA-Z] */
- *p = ch & 0x7f;
- p++;
- len--;
- memmove(p, p + 1, len);
- len--;
- } else {
- p += 2;
- len -= 2;
- }
- } else if (*p == 0xa1) {
- register guchar ch = *(p + 1);
-
- if (ch >= 0xa0 && ch <= 0xef &&
- NCV != char_tbl[ch - 0xa0]) {
- *p = char_tbl[ch - 0xa0];
- p++;
- len--;
- memmove(p, p + 1, len);
- len--;
- } else {
- p += 2;
- len -= 2;
- }
- } else if (iseuckanji(*p)) {
- p += 2;
- len -= 2;
- } else {
- p++;
- len--;
- }
- }
-}
-
-CharSet conv_guess_ja_encoding(const gchar *str)
+static CharSet conv_guess_ja_encoding(const gchar *str)
{
const guchar *p = str;
CharSet guessed = C_US_ASCII;
return guessed;
}
-static void conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_jistoutf8(outbuf, outlen, inbuf);
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ return conv_jistoutf8(outbuf, outlen, inbuf);
}
-static void conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_sjistoutf8(outbuf, outlen, inbuf);
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ return conv_sjistoutf8(outbuf, outlen, inbuf);
}
-static void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_euctoutf8(outbuf, outlen, inbuf);
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ return conv_euctoutf8(outbuf, outlen, inbuf);
}
void conv_utf8todisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_if_fail(inbuf != NULL);
+ cm_return_if_fail(outbuf != NULL);
+
if (g_utf8_validate(inbuf, -1, NULL) == TRUE)
strncpy2(outbuf, inbuf, outlen);
else
conv_ustodisp(outbuf, outlen, inbuf);
}
-static void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_anytoutf8(outbuf, outlen, inbuf);
+ gint r = 0;
+
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
+ if (conv_anytoutf8(outbuf, outlen, inbuf) < 0)
+ r = -1;
+ if (g_utf8_validate(outbuf, -1, NULL) != TRUE)
+ conv_unreadable_8bit(outbuf);
+ return r;
}
-static void conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
strncpy2(outbuf, inbuf, outlen);
conv_unreadable_8bit(outbuf);
+
+ return 0;
}
void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *tmpstr;
+ cm_return_if_fail(inbuf != NULL);
+ cm_return_if_fail(outbuf != NULL);
+
+ codeconv_set_strict(TRUE);
tmpstr = conv_iconv_strdup(inbuf, conv_get_locale_charset_str(),
CS_INTERNAL);
- if (tmpstr) {
+ codeconv_set_strict(FALSE);
+ if (tmpstr && g_utf8_validate(tmpstr, -1, NULL)) {
strncpy2(outbuf, tmpstr, outlen);
g_free(tmpstr);
- } else
- strncpy2(outbuf, inbuf, outlen);
+ return;
+ } else if (tmpstr && !g_utf8_validate(tmpstr, -1, NULL)) {
+ g_free(tmpstr);
+ codeconv_set_strict(TRUE);
+ tmpstr = conv_iconv_strdup(inbuf,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ codeconv_set_strict(FALSE);
+ }
+ if (tmpstr && g_utf8_validate(tmpstr, -1, NULL)) {
+ strncpy2(outbuf, tmpstr, outlen);
+ g_free(tmpstr);
+ return;
+ } else {
+ g_free(tmpstr);
+ conv_utf8todisp(outbuf, outlen, inbuf);
+ }
}
-static void conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
+static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
strncpy2(outbuf, inbuf, outlen);
+ return 0;
+}
+
+static const gchar *
+conv_get_fallback_for_private_encoding(const gchar *encoding)
+{
+ if (encoding) {
+ if ((encoding[0] == 'X' || encoding[0] == 'x') &&
+ encoding[1] == '-') {
+ if (!g_ascii_strcasecmp(encoding, CS_X_MACCYR))
+ return CS_MACCYR;
+ if (!g_ascii_strcasecmp(encoding, CS_X_GBK))
+ return CS_GBK;
+ }
+ else if(!g_ascii_strcasecmp(encoding, CS_ISO_8859_8_I)) {
+ /*
+ * ISO-8859-8-I is a variant which fully
+ * agrees with ISO-8859-8 on character
+ * codings, and differs only in directionality
+ * implications, which are ignored here
+ * anyway; and is not recognized by iconv
+ */
+ return CS_ISO_8859_8;
+ }
+ }
+
+ return encoding;
}
CodeConverter *conv_code_converter_new(const gchar *src_charset)
{
CodeConverter *conv;
+ src_charset = conv_get_fallback_for_private_encoding(src_charset);
+
conv = g_new0(CodeConverter, 1);
conv->code_conv_func = conv_get_code_conv_func(src_charset, NULL);
conv->charset_str = g_strdup(src_charset);
gint conv_convert(CodeConverter *conv, gchar *outbuf, gint outlen,
const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, -1);
+ cm_return_val_if_fail(outbuf != NULL, -1);
+
if (conv->code_conv_func != conv_noconv)
- conv->code_conv_func(outbuf, outlen, inbuf);
+ return conv->code_conv_func(outbuf, outlen, inbuf);
else {
gchar *str;
size_t len;
CodeConvFunc conv_func;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
+ if (!strcmp2(src_code, dest_code)) {
+ CharSet dest_charset = conv_get_charset_from_str(dest_code);
+ if (strict_mode && dest_charset == C_UTF_8) {
+ /* ensure valid UTF-8 if target is UTF-8 */
+ if (!g_utf8_validate(inbuf, -1, NULL)) {
+ return NULL;
+ }
+ }
+ /* otherwise, try for a lucky day */
+ return g_strdup(inbuf);
+ }
+
+ src_code = conv_get_fallback_for_private_encoding(src_code);
conv_func = conv_get_code_conv_func(src_code, dest_code);
+ if (conv_func == conv_ustodisp && strict_mode && !is_ascii_str(inbuf))
+ return NULL;
+
if (conv_func != conv_noconv) {
len = (strlen(inbuf) + 1) * 3;
buf = g_malloc(len);
- if (!buf) return NULL;
- conv_func(buf, len, inbuf);
- return g_realloc(buf, strlen(buf) + 1);
+ if (conv_func(buf, len, inbuf) == 0 || !strict_mode)
+ return g_realloc(buf, strlen(buf) + 1);
+ else {
+ g_free(buf);
+ return NULL;
+ }
}
return conv_iconv_strdup(inbuf, src_code, dest_code);
}
-CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
+static CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
const gchar *dest_charset_str)
{
CodeConvFunc code_conv = conv_noconv;
/* auto detection mode */
if (!src_charset_str && !dest_charset_str) {
- if (src_charset == C_EUC_JP || src_charset == C_SHIFT_JIS)
+ if (conv_is_ja_locale())
return conv_anytodisp;
else
return conv_noconv;
return code_conv;
}
-gchar *conv_iconv_strdup(const gchar *inbuf,
+static gchar *conv_iconv_strdup(const gchar *inbuf,
const gchar *src_code, const gchar *dest_code)
{
iconv_t cd;
gchar *outbuf;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
+ if (!src_code && !dest_code &&
+ g_utf8_validate(inbuf, -1, NULL))
+ return g_strdup(inbuf);
+
if (!src_code)
src_code = conv_get_outgoing_charset_str();
if (!dest_code)
if (!strcasecmp(src_code, dest_code))
return g_strdup(inbuf);
- /* don't convert if current codeset is US-ASCII */
+ /* don't convert if dest codeset is US-ASCII */
+ if (!strcasecmp(src_code, CS_US_ASCII))
+ return g_strdup(inbuf);
+
+ /* don't convert if dest codeset is US-ASCII */
if (!strcasecmp(dest_code, CS_US_ASCII))
return g_strdup(inbuf);
size_t n_conv;
size_t len;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
inbuf_p = inbuf;
in_size = strlen(inbuf);
in_left = in_size;
while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
&outbuf_p, &out_left)) == (size_t)-1) {
if (EILSEQ == errno) {
+ if (strict_mode) {
+ g_free(outbuf);
+ return NULL;
+ }
//g_print("iconv(): at %d: %s\n", in_size - in_left, g_strerror(errno));
inbuf_p++;
in_left--;
} else if (E2BIG == errno) {
EXPAND_BUF();
} else {
- g_warning("conv_iconv_strdup(): %s\n",
+ g_warning("conv_iconv_strdup(): %s",
g_strerror(errno));
break;
}
if (E2BIG == errno) {
EXPAND_BUF();
} else {
- g_warning("conv_iconv_strdup(): %s\n",
+ g_warning("conv_iconv_strdup(): %s",
g_strerror(errno));
break;
}
{C_WINDOWS_1257, CS_WINDOWS_1257},
{C_WINDOWS_1258, CS_WINDOWS_1258},
{C_KOI8_R, CS_KOI8_R},
+ {C_MACCYR, CS_MACCYR},
{C_KOI8_T, CS_KOI8_T},
{C_KOI8_U, CS_KOI8_U},
{C_ISO_2022_JP, CS_ISO_2022_JP},
{C_EUC_KR, CS_EUC_KR},
{C_ISO_2022_CN, CS_ISO_2022_CN},
{C_EUC_CN, CS_EUC_CN},
+ {C_GB18030, CS_GB18030},
{C_GB2312, CS_GB2312},
{C_GBK, CS_GBK},
{C_EUC_TW, CS_EUC_TW},
CharSet charset;
CharSet out_charset;
} locale_table[] = {
- {"ja_JP.eucJP" , C_EUC_JP , C_ISO_2022_JP},
- {"ja_JP.EUC-JP" , C_EUC_JP , C_ISO_2022_JP},
- {"ja_JP.EUC" , C_EUC_JP , C_ISO_2022_JP},
- {"ja_JP.ujis" , C_EUC_JP , C_ISO_2022_JP},
- {"ja_JP.SJIS" , C_SHIFT_JIS , C_ISO_2022_JP},
- {"ja_JP.JIS" , C_ISO_2022_JP , C_ISO_2022_JP},
- {"ja_JP" , C_EUC_JP , C_ISO_2022_JP},
- {"ko_KR.EUC-KR" , C_EUC_KR , C_EUC_KR},
- {"ko_KR" , C_EUC_KR , C_EUC_KR},
- {"zh_CN.GB2312" , C_GB2312 , C_GB2312},
- {"zh_CN.GBK" , C_GBK , C_GB2312},
- {"zh_CN" , C_GB2312 , C_GB2312},
- {"zh_HK" , C_BIG5_HKSCS , C_BIG5_HKSCS},
- {"zh_TW.eucTW" , C_EUC_TW , C_BIG5},
- {"zh_TW.EUC-TW" , C_EUC_TW , C_BIG5},
- {"zh_TW.Big5" , C_BIG5 , C_BIG5},
- {"zh_TW" , C_BIG5 , C_BIG5},
-
- {"ru_RU.KOI8-R" , C_KOI8_R , C_KOI8_R},
- {"ru_RU.KOI8R" , C_KOI8_R , C_KOI8_R},
- {"ru_RU.CP1251" , C_WINDOWS_1251, C_KOI8_R},
- {"ru_RU" , C_ISO_8859_5 , C_KOI8_R},
- {"tg_TJ" , C_KOI8_T , C_KOI8_T},
- {"ru_UA" , C_KOI8_U , C_KOI8_U},
- {"uk_UA.CP1251" , C_WINDOWS_1251, C_KOI8_U},
- {"uk_UA" , C_KOI8_U , C_KOI8_U},
-
- {"be_BY" , C_WINDOWS_1251, C_WINDOWS_1251},
- {"bg_BG" , C_WINDOWS_1251, C_WINDOWS_1251},
-
- {"yi_US" , C_WINDOWS_1255, C_WINDOWS_1255},
-
- {"af_ZA" , C_ISO_8859_1 , C_ISO_8859_1},
- {"br_FR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"ca_ES" , C_ISO_8859_1 , C_ISO_8859_1},
- {"da_DK" , C_ISO_8859_1 , C_ISO_8859_1},
- {"de_AT" , C_ISO_8859_1 , C_ISO_8859_1},
- {"de_BE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"de_CH" , C_ISO_8859_1 , C_ISO_8859_1},
- {"de_DE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"de_LU" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_AU" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_BW" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_CA" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_DK" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_GB" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_HK" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_IE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_NZ" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_PH" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_SG" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_US" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_ZA" , C_ISO_8859_1 , C_ISO_8859_1},
- {"en_ZW" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_AR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_BO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_CL" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_CO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_CR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_DO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_EC" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_ES" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_GT" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_HN" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_MX" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_NI" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_PA" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_PE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_PR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_PY" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_SV" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_US" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_UY" , C_ISO_8859_1 , C_ISO_8859_1},
- {"es_VE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"et_EE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"eu_ES" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fi_FI" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fo_FO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fr_BE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fr_CA" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fr_CH" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fr_FR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"fr_LU" , C_ISO_8859_1 , C_ISO_8859_1},
- {"ga_IE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"gl_ES" , C_ISO_8859_1 , C_ISO_8859_1},
- {"gv_GB" , C_ISO_8859_1 , C_ISO_8859_1},
- {"id_ID" , C_ISO_8859_1 , C_ISO_8859_1},
- {"is_IS" , C_ISO_8859_1 , C_ISO_8859_1},
- {"it_CH" , C_ISO_8859_1 , C_ISO_8859_1},
- {"it_IT" , C_ISO_8859_1 , C_ISO_8859_1},
- {"kl_GL" , C_ISO_8859_1 , C_ISO_8859_1},
- {"kw_GB" , C_ISO_8859_1 , C_ISO_8859_1},
- {"ms_MY" , C_ISO_8859_1 , C_ISO_8859_1},
- {"nl_BE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"nl_NL" , C_ISO_8859_1 , C_ISO_8859_1},
- {"nn_NO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"no_NO" , C_ISO_8859_1 , C_ISO_8859_1},
- {"oc_FR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"pt_BR" , C_ISO_8859_1 , C_ISO_8859_1},
- {"pt_PT" , C_ISO_8859_1 , C_ISO_8859_1},
- {"sq_AL" , C_ISO_8859_1 , C_ISO_8859_1},
- {"sv_FI" , C_ISO_8859_1 , C_ISO_8859_1},
- {"sv_SE" , C_ISO_8859_1 , C_ISO_8859_1},
- {"tl_PH" , C_ISO_8859_1 , C_ISO_8859_1},
- {"uz_UZ" , C_ISO_8859_1 , C_ISO_8859_1},
- {"wa_BE" , C_ISO_8859_1 , C_ISO_8859_1},
-
- {"bs_BA" , C_ISO_8859_2 , C_ISO_8859_2},
- {"cs_CZ" , C_ISO_8859_2 , C_ISO_8859_2},
- {"hr_HR" , C_ISO_8859_2 , C_ISO_8859_2},
- {"hu_HU" , C_ISO_8859_2 , C_ISO_8859_2},
- {"pl_PL" , C_ISO_8859_2 , C_ISO_8859_2},
- {"ro_RO" , C_ISO_8859_2 , C_ISO_8859_2},
- {"sk_SK" , C_ISO_8859_2 , C_ISO_8859_2},
- {"sl_SI" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"ja_JP.eucJP" , C_EUC_JP , C_ISO_2022_JP},
+ {"ja_JP.EUC-JP" , C_EUC_JP , C_ISO_2022_JP},
+ {"ja_JP.EUC" , C_EUC_JP , C_ISO_2022_JP},
+ {"ja_JP.ujis" , C_EUC_JP , C_ISO_2022_JP},
+ {"ja_JP.SJIS" , C_SHIFT_JIS , C_ISO_2022_JP},
+ {"ja_JP.JIS" , C_ISO_2022_JP , C_ISO_2022_JP},
+#ifdef G_OS_WIN32
+ {"ja_JP" , C_SHIFT_JIS , C_ISO_2022_JP},
+#else
+ {"ja_JP" , C_EUC_JP , C_ISO_2022_JP},
+#endif
+ {"ko_KR.EUC-KR" , C_EUC_KR , C_EUC_KR},
+ {"ko_KR" , C_EUC_KR , C_EUC_KR},
+ {"zh_CN.GB18030" , C_GB18030 , C_GB18030},
+ {"zh_CN.GB2312" , C_GB2312 , C_GB2312},
+ {"zh_CN.GBK" , C_GBK , C_GBK},
+ {"zh_CN" , C_GB18030 , C_GB18030},
+ {"zh_HK" , C_BIG5_HKSCS , C_BIG5_HKSCS},
+ {"zh_TW.eucTW" , C_EUC_TW , C_BIG5},
+ {"zh_TW.EUC-TW" , C_EUC_TW , C_BIG5},
+ {"zh_TW.Big5" , C_BIG5 , C_BIG5},
+ {"zh_TW" , C_BIG5 , C_BIG5},
+
+ {"ru_RU.KOI8-R" , C_KOI8_R , C_KOI8_R},
+ {"ru_RU.KOI8R" , C_KOI8_R , C_KOI8_R},
+ {"ru_RU.CP1251" , C_WINDOWS_1251, C_KOI8_R},
+#ifdef G_OS_WIN32
+ {"ru_RU" , C_WINDOWS_1251, C_KOI8_R},
+#else
+ {"ru_RU" , C_ISO_8859_5 , C_KOI8_R},
+#endif
+ {"tg_TJ" , C_KOI8_T , C_KOI8_T},
+ {"ru_UA" , C_KOI8_U , C_KOI8_U},
+ {"uk_UA.CP1251" , C_WINDOWS_1251, C_KOI8_U},
+ {"uk_UA" , C_KOI8_U , C_KOI8_U},
+
+ {"be_BY" , C_WINDOWS_1251, C_WINDOWS_1251},
+ {"bg_BG" , C_WINDOWS_1251, C_WINDOWS_1251},
+
+ {"yi_US" , C_WINDOWS_1255, C_WINDOWS_1255},
+
+ {"af_ZA" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"br_FR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"ca_ES" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"da_DK" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"de_AT" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"de_BE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"de_CH" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"de_DE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"de_LU" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_AU" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_BW" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_CA" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_DK" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_GB" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_HK" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_IE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_NZ" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_PH" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_SG" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_US" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_ZA" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"en_ZW" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_AR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_BO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_CL" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_CO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_CR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_DO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_EC" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_ES" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_GT" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_HN" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_MX" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_NI" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_PA" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_PE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_PR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_PY" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_SV" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_US" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_UY" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"es_VE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"et_EE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"eu_ES" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fi_FI" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fo_FO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fr_BE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fr_CA" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fr_CH" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fr_FR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"fr_LU" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"ga_IE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"gl_ES" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"gv_GB" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"id_ID" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"is_IS" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"it_CH" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"it_IT" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"kl_GL" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"kw_GB" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"ms_MY" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"nl_BE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"nl_NL" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"nb_NO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"nn_NO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"no_NO" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"oc_FR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"pt_BR" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"pt_PT" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"sq_AL" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"sv_FI" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"sv_SE" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"tl_PH" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"uz_UZ" , C_ISO_8859_1 , C_ISO_8859_1},
+ {"wa_BE" , C_ISO_8859_1 , C_ISO_8859_1},
+
+ {"bs_BA" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"cs_CZ" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"hr_HR" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"hu_HU" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"pl_PL" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"ro_RO" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"sk_SK" , C_ISO_8859_2 , C_ISO_8859_2},
+ {"sl_SI" , C_ISO_8859_2 , C_ISO_8859_2},
{"sr_YU@cyrillic" , C_ISO_8859_5 , C_ISO_8859_5},
{"sr_YU" , C_ISO_8859_2 , C_ISO_8859_2},
{"lt_LT.ISO_8859-4" , C_ISO_8859_4 , C_ISO_8859_4},
{"lt_LT" , C_ISO_8859_13 , C_ISO_8859_13},
- {"mk_MK" , C_ISO_8859_5 , C_ISO_8859_5},
-
- {"ar_AE" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_BH" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_DZ" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_EG" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_IQ" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_JO" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_KW" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_LB" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_LY" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_MA" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_OM" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_QA" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_SA" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_SD" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_SY" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_TN" , C_ISO_8859_6 , C_ISO_8859_6},
- {"ar_YE" , C_ISO_8859_6 , C_ISO_8859_6},
-
- {"el_GR" , C_ISO_8859_7 , C_ISO_8859_7},
- {"he_IL" , C_ISO_8859_8 , C_ISO_8859_8},
- {"iw_IL" , C_ISO_8859_8 , C_ISO_8859_8},
- {"tr_TR" , C_ISO_8859_9 , C_ISO_8859_9},
-
- {"lv_LV" , C_ISO_8859_13 , C_ISO_8859_13},
- {"mi_NZ" , C_ISO_8859_13 , C_ISO_8859_13},
-
- {"cy_GB" , C_ISO_8859_14 , C_ISO_8859_14},
-
- {"ar_IN" , C_UTF_8 , C_UTF_8},
- {"en_IN" , C_UTF_8 , C_UTF_8},
- {"se_NO" , C_UTF_8 , C_UTF_8},
- {"ta_IN" , C_UTF_8 , C_UTF_8},
- {"te_IN" , C_UTF_8 , C_UTF_8},
- {"ur_PK" , C_UTF_8 , C_UTF_8},
-
- {"th_TH" , C_TIS_620 , C_TIS_620},
- /* {"th_TH" , C_WINDOWS_874}, */
- /* {"th_TH" , C_ISO_8859_11}, */
-
- {"ka_GE" , C_GEORGIAN_PS , C_GEORGIAN_PS},
- {"vi_VN.TCVN" , C_TCVN5712_1 , C_TCVN5712_1},
+ {"mk_MK" , C_ISO_8859_5 , C_ISO_8859_5},
+
+ {"ar_AE" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_BH" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_DZ" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_EG" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_IQ" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_JO" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_KW" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_LB" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_LY" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_MA" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_OM" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_QA" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_SA" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_SD" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_SY" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_TN" , C_ISO_8859_6 , C_ISO_8859_6},
+ {"ar_YE" , C_ISO_8859_6 , C_ISO_8859_6},
+
+ {"el_GR" , C_ISO_8859_7 , C_ISO_8859_7},
+ {"he_IL" , C_ISO_8859_8 , C_ISO_8859_8},
+ {"iw_IL" , C_ISO_8859_8 , C_ISO_8859_8},
+ {"tr_TR" , C_ISO_8859_9 , C_ISO_8859_9},
+
+ {"lv_LV" , C_ISO_8859_13 , C_ISO_8859_13},
+ {"mi_NZ" , C_ISO_8859_13 , C_ISO_8859_13},
+
+ {"cy_GB" , C_ISO_8859_14 , C_ISO_8859_14},
+
+ {"ar_IN" , C_UTF_8 , C_UTF_8},
+ {"en_IN" , C_UTF_8 , C_UTF_8},
+ {"se_NO" , C_UTF_8 , C_UTF_8},
+ {"ta_IN" , C_UTF_8 , C_UTF_8},
+ {"te_IN" , C_UTF_8 , C_UTF_8},
+ {"ur_PK" , C_UTF_8 , C_UTF_8},
+
+ {"th_TH" , C_TIS_620 , C_TIS_620},
+ /* {"th_TH" , C_WINDOWS_874}, */
+ /* {"th_TH" , C_ISO_8859_11}, */
+
+ {"ka_GE" , C_GEORGIAN_PS , C_GEORGIAN_PS},
+ {"vi_VN.TCVN" , C_TCVN5712_1 , C_TCVN5712_1},
{"C" , C_US_ASCII , C_US_ASCII},
{"POSIX" , C_US_ASCII , C_US_ASCII},
return GPOINTER_TO_UINT(g_hash_table_lookup(table, charset));
}
-CharSet conv_get_locale_charset(void)
+static CharSet conv_get_locale_charset(void)
{
- static CharSet cur_charset = -1;
+ static CharSet cur_charset = C_UNINITIALIZED;
const gchar *cur_locale;
const gchar *p;
gint i;
- if (cur_charset != -1)
+ if (cur_charset != C_UNINITIALIZED)
return cur_charset;
cur_locale = conv_get_current_locale();
return cur_charset;
}
- if (strcasestr(cur_locale, "UTF-8")) {
+ if (strcasestr(cur_locale, "UTF-8") ||
+ strcasestr(cur_locale, "utf8")) {
+ cur_charset = C_UTF_8;
+ return cur_charset;
+ }
+
+ if ((p = strcasestr(cur_locale, "@euro")) && p[5] == '\0') {
+ cur_charset = C_ISO_8859_15;
+ return cur_charset;
+ }
+
+ for (i = 0; i < sizeof(locale_table) / sizeof(locale_table[0]); i++) {
+ const gchar *p;
+
+ /* "ja_JP.EUC" matches with "ja_JP.eucJP", "ja_JP.EUC" and
+ "ja_JP". "ja_JP" matches with "ja_JP.xxxx" and "ja" */
+ if (!g_ascii_strncasecmp(cur_locale, locale_table[i].locale,
+ strlen(locale_table[i].locale))) {
+ cur_charset = locale_table[i].charset;
+ return cur_charset;
+ } else if ((p = strchr(locale_table[i].locale, '_')) &&
+ !strchr(p + 1, '.')) {
+ if (strlen(cur_locale) == 2 &&
+ !g_ascii_strncasecmp(cur_locale, locale_table[i].locale, 2)) {
+ cur_charset = locale_table[i].charset;
+ return cur_charset;
+ }
+ }
+ }
+
+ cur_charset = C_AUTO;
+ return cur_charset;
+}
+
+static CharSet conv_get_locale_charset_no_utf8(void)
+{
+ static CharSet cur_charset = C_UNINITIALIZED;
+ const gchar *cur_locale;
+ const gchar *p;
+ gint i;
+
+ if (prefs_common.broken_are_utf8) {
+ cur_charset = C_UTF_8;
+ return cur_charset;
+ }
+
+ cur_locale = conv_get_current_locale();
+ if (!cur_locale) {
+ cur_charset = C_US_ASCII;
+ return cur_charset;
+ }
+
+ if (strcasestr(cur_locale, "UTF-8") ||
+ strcasestr(cur_locale, "utf8")) {
cur_charset = C_UTF_8;
return cur_charset;
}
return codeset ? codeset : CS_INTERNAL;
}
-CharSet conv_get_internal_charset(void)
+const gchar *conv_get_locale_charset_str_no_utf8(void)
{
- return C_INTERNAL;
-}
+ static const gchar *codeset = NULL;
-const gchar *conv_get_internal_charset_str(void)
-{
- return CS_INTERNAL;
+ if (!codeset)
+ codeset = conv_get_charset_str(conv_get_locale_charset_no_utf8());
+
+ return codeset ? codeset : CS_INTERNAL;
}
-CharSet conv_get_outgoing_charset(void)
+static CharSet conv_get_outgoing_charset(void)
{
- static CharSet out_charset = -1;
+ static CharSet out_charset = C_UNINITIALIZED;
const gchar *cur_locale;
const gchar *p;
gint i;
- if (out_charset != -1)
+ if (out_charset != C_UNINITIALIZED)
return out_charset;
cur_locale = conv_get_current_locale();
return out_charset;
}
+ if (strcasestr(cur_locale, "UTF-8") ||
+ strcasestr(cur_locale, "utf8")) {
+ out_charset = C_UTF_8;
+ return out_charset;
+ }
+
if ((p = strcasestr(cur_locale, "@euro")) && p[5] == '\0') {
out_charset = C_ISO_8859_15;
return out_charset;
CharSet out_charset;
const gchar *str;
- if (prefs_common.outgoing_charset) {
- if (!isalpha((guchar)prefs_common.outgoing_charset[0])) {
- g_free(prefs_common.outgoing_charset);
- prefs_common.outgoing_charset = g_strdup(CS_AUTO);
- } else if (strcmp(prefs_common.outgoing_charset, CS_AUTO) != 0)
- return prefs_common.outgoing_charset;
- }
-
out_charset = conv_get_outgoing_charset();
str = conv_get_charset_str(out_charset);
return str ? str : CS_UTF_8;
}
-gboolean conv_is_multibyte_encoding(CharSet encoding)
-{
- switch (encoding) {
- case C_EUC_JP:
- case C_EUC_JP_MS:
- case C_EUC_KR:
- case C_EUC_TW:
- case C_EUC_CN:
- case C_ISO_2022_JP:
- case C_ISO_2022_JP_2:
- case C_ISO_2022_JP_3:
- case C_ISO_2022_KR:
- case C_ISO_2022_CN:
- case C_SHIFT_JIS:
- case C_GB2312:
- case C_BIG5:
- case C_UTF_8:
- case C_UTF_7:
- return TRUE;
- default:
- return FALSE;
- }
-}
-
const gchar *conv_get_current_locale(void)
{
const gchar *cur_locale;
+#ifdef G_OS_WIN32
+ cur_locale = g_win32_getlocale();
+#else
cur_locale = g_getenv("LC_ALL");
if (!cur_locale) cur_locale = g_getenv("LC_CTYPE");
if (!cur_locale) cur_locale = g_getenv("LANG");
if (!cur_locale) cur_locale = setlocale(LC_CTYPE, NULL);
+#endif /* G_OS_WIN32 */
debug_print("current locale: %s\n",
cur_locale ? cur_locale : "(none)");
return cur_locale;
}
-void conv_unmime_header_overwrite(gchar *str)
+static gboolean conv_is_ja_locale(void)
{
- gchar *buf;
- gint buflen;
- CharSet cur_charset;
+ static gint is_ja_locale = -1;
+ const gchar *cur_locale;
- cur_charset = conv_get_locale_charset();
+ if (is_ja_locale != -1)
+ return is_ja_locale != 0;
- if (cur_charset == C_EUC_JP) {
- buflen = strlen(str) * 2 + 1;
- Xalloca(buf, buflen, return);
- conv_anytodisp(buf, buflen, str);
- unmime_header(str, buf);
- } else {
- buflen = strlen(str) + 1;
- Xalloca(buf, buflen, return);
- unmime_header(buf, str);
- strncpy2(str, buf, buflen);
+ is_ja_locale = 0;
+ cur_locale = conv_get_current_locale();
+ if (cur_locale) {
+ if (g_ascii_strncasecmp(cur_locale, "ja", 2) == 0)
+ is_ja_locale = 1;
}
+
+ return is_ja_locale != 0;
}
-void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
- const gchar *charset)
+gchar *conv_unmime_header(const gchar *str, const gchar *default_encoding,
+ gboolean addr_field)
{
- CharSet cur_charset;
+ gchar buf[BUFFSIZE];
- cur_charset = conv_get_locale_charset();
+ cm_return_val_if_fail(str != NULL, NULL);
- if (cur_charset == C_EUC_JP) {
- gchar *buf;
- gint buflen;
+ if (is_ascii_str(str))
+ return unmime_header(str, addr_field);
- buflen = strlen(str) * 2 + 1;
- Xalloca(buf, buflen, return);
- conv_anytodisp(buf, buflen, str);
- unmime_header(outbuf, buf);
- } else {
- gchar *tmp = NULL;
- unmime_header(outbuf, str);
-
- if (outbuf && !g_utf8_validate(outbuf, -1, NULL)) {
- if (conv_get_locale_charset() != C_INTERNAL)
- tmp = conv_codeset_strdup(outbuf,
- conv_get_locale_charset_str(),
- CS_INTERNAL);
-
- if (tmp) {
- strncpy(outbuf, tmp, outlen-1);
- g_free(tmp);
- } else {
- conv_unreadable_8bit(outbuf);
- }
+ if (default_encoding) {
+ gchar *utf8_buf;
+
+ utf8_buf = conv_codeset_strdup
+ (str, default_encoding, CS_INTERNAL);
+ if (utf8_buf) {
+ gchar *decoded_str;
+
+ decoded_str = unmime_header(utf8_buf, addr_field);
+ g_free(utf8_buf);
+ return decoded_str;
}
}
+ if (conv_is_ja_locale())
+ conv_anytodisp(buf, sizeof(buf), str);
+ else
+ conv_localetodisp(buf, sizeof(buf), str);
+
+ return unmime_header(buf, addr_field);
}
#define MAX_LINELEN 76
*destp++ = ' '; \
left = MAX_LINELEN - 1; \
} \
+ } else if (destp == (guchar *)dest && left < 7) { \
+ if (is_plain_text && isspace(*srcp)) \
+ srcp++; \
+ if (*srcp) { \
+ *destp++ = '\n'; \
+ *destp++ = ' '; \
+ left = MAX_LINELEN - 1; \
+ } \
} \
} \
}
-void conv_encode_header(gchar *dest, gint len, const gchar *src,
- gint header_len, gboolean addr_field)
+#define B64LEN(len) ((len) / 3 * 4 + ((len) % 3 ? 4 : 0))
+
+void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
+ gint header_len, gboolean addr_field,
+ const gchar *out_encoding_)
{
const gchar *cur_encoding;
const gchar *out_encoding;
guchar *destp = dest;
gboolean use_base64;
- g_return_if_fail(g_utf8_validate(src, -1, NULL) == TRUE);
+ cm_return_if_fail(g_utf8_validate(src, -1, NULL) == TRUE);
+ cm_return_if_fail(destp != NULL);
if (MB_CUR_MAX > 1) {
use_base64 = TRUE;
}
cur_encoding = CS_INTERNAL;
- out_encoding = conv_get_outgoing_charset_str();
+
+ if (out_encoding_)
+ out_encoding = out_encoding_;
+ else
+ out_encoding = conv_get_outgoing_charset_str();
+
if (!strcmp(out_encoding, CS_US_ASCII))
out_encoding = CS_ISO_8859_1;
continue;
}
- /* don't include parentheses in encoded strings */
- if (addr_field && (*srcp == '(' || *srcp == ')')) {
+ /* don't include parentheses and quotes in encoded strings */
+ if (addr_field && (*srcp == '(' || *srcp == ')' || *srcp == '"')) {
LBREAK_IF_REQUIRED(left < 2, FALSE);
*destp++ = *srcp++;
left--;
break;
/* don't include parentheses in encoded
strings */
- if (addr_field && (*p == '(' || *p == ')'))
+ if (addr_field && (*p == '(' || *p == ')' || *p == '"'))
break;
mb_len = g_utf8_skip[*p];
out_str = conv_codeset_strdup
(part_str, cur_encoding, out_encoding);
if (!out_str) {
- g_warning("conv_encode_header(): code conversion failed\n");
- conv_unreadable_8bit(part_str);
- out_str = g_strdup(part_str);
+ if (strict_mode) {
+ *dest = '\0';
+ return;
+ } else {
+ g_warning("conv_encode_header_full(): code conversion failed");
+ conv_unreadable_8bit(part_str);
+ out_str = g_strdup(part_str);
+ }
}
out_str_len = strlen(out_str);
cur_len += mb_len;
p += mb_len;
} else if (cur_len == 0) {
+ left = 0;
LBREAK_IF_REQUIRED(1, FALSE);
continue;
} else {
out_str = conv_codeset_strdup
(part_str, cur_encoding, out_encoding);
if (!out_str) {
- g_warning("conv_encode_header(): code conversion failed\n");
+ g_warning("conv_encode_header_full(): code conversion failed");
conv_unreadable_8bit(part_str);
out_str = g_strdup(part_str);
}
out_enc_str_len =
qp_get_q_encoding_len(out_str);
- Xalloca(enc_str, out_enc_str_len + 1, );
if (use_base64)
- base64_encode(enc_str, out_str, out_str_len);
- else
+ enc_str = g_base64_encode(out_str, out_str_len);
+ else {
+ Xalloca(enc_str, out_enc_str_len + 1, );
qp_q_encode(enc_str, out_str);
+ }
g_free(out_str);
g_snprintf(destp, mime_block_len + 1,
MIMESEP_BEGIN "%s%s%s" MIMESEP_END,
out_encoding, mimesep_enc, enc_str);
+
+ if (use_base64)
+ g_free(enc_str);
+
destp += mime_block_len;
srcp += cur_len;
*destp = '\0';
}
+void conv_encode_header(gchar *dest, gint len, const gchar *src,
+ gint header_len, gboolean addr_field)
+{
+ conv_encode_header_full(dest,len,src,header_len,addr_field,NULL);
+}
+
#undef LBREAK_IF_REQUIRED
+#undef B64LEN
+
gchar *conv_filename_from_utf8(const gchar *utf8_file)
{
gchar *fs_file;
GError *error = NULL;
+ cm_return_val_if_fail(utf8_file != NULL, NULL);
+
fs_file = g_filename_from_utf8(utf8_file, -1, NULL, NULL, &error);
if (error) {
- g_warning("failed to convert encoding of file name: %s\n",
+ debug_print("failed to convert encoding of file name: %s\n",
error->message);
g_error_free(error);
}
gchar *conv_filename_to_utf8(const gchar *fs_file)
{
- gchar *utf8_file;
+ gchar *utf8_file = NULL;
GError *error = NULL;
+ cm_return_val_if_fail(fs_file != NULL, NULL);
+
utf8_file = g_filename_to_utf8(fs_file, -1, NULL, NULL, &error);
if (error) {
- g_warning("failed to convert encoding of file name: %s\n",
+ g_warning("failed to convert encoding of file name: %s",
error->message);
g_error_free(error);
}
- if (!utf8_file)
+
+ if (!utf8_file || !g_utf8_validate(utf8_file, -1, NULL)) {
+ g_free(utf8_file);
utf8_file = g_strdup(fs_file);
+ conv_unreadable_8bit(utf8_file);
+ }
return utf8_file;
}