/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* 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
# include <locale.h>
#endif
+#include <iconv.h>
+
#include "intl.h"
#include "codeconv.h"
#include "unmime.h"
JIS_AUXKANJI
} JISState;
-#define SUBST_CHAR '_'
+#define SUBST_CHAR 0x5f;
#define ESC '\033'
#define iseuckanji(c) \
state = JIS_AUXKANJI; \
}
-void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+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 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 void conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
+static void 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 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 void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
guchar *out = outbuf;
return 1;
}
-void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
guchar *out = outbuf;
JISState state = JIS_ASCII;
while (*in != '\0') {
- if (isascii(*in)) {
+ if (IS_ASCII(*in)) {
K_OUT();
*out++ = *in++;
} else if (iseuckanji(*in)) {
K_OUT();
*out++ = SUBST_CHAR;
in++;
- if (*in != '\0' && !isascii(*in)) {
+ if (*in != '\0' && !IS_ASCII(*in)) {
*out++ = SUBST_CHAR;
in++;
}
} else {
K_OUT();
in++;
- if (*in != '\0' && !isascii(*in)) {
+ if (*in != '\0' && !IS_ASCII(*in)) {
*out++ = SUBST_CHAR;
in++;
}
*out++ = *in++ & 0x7f;
} else {
K_OUT();
- if (*in != '\0' && !isascii(*in)) {
+ if (*in != '\0' && !IS_ASCII(*in)) {
*out++ = SUBST_CHAR;
in++;
- if (*in != '\0' && !isascii(*in)) {
+ if (*in != '\0' && !IS_ASCII(*in)) {
*out++ = SUBST_CHAR;
in++;
}
*out = '\0';
}
-void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
const guchar *in = inbuf;
guchar *out = outbuf;
while (*in != '\0') {
- if (isascii(*in)) {
+ if (IS_ASCII(*in)) {
*out++ = *in++;
} else if (issjiskanji1(*in)) {
if (issjiskanji2(*(in + 1))) {
} else {
*out++ = SUBST_CHAR;
in++;
- if (*in != '\0' && !isascii(*in)) {
+ if (*in != '\0' && !IS_ASCII(*in)) {
*out++ = SUBST_CHAR;
in++;
}
*out = '\0';
}
-void conv_anytoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- switch (conv_guess_ja_encoding(inbuf)) {
- case C_ISO_2022_JP:
- conv_jistoeuc(outbuf, outlen, inbuf);
- break;
- case C_SHIFT_JIS:
- conv_sjistoeuc(outbuf, outlen, inbuf);
- break;
- default:
+ gchar *eucstr;
+
+ Xalloca(eucstr, outlen, return);
+
+ conv_jistoeuc(eucstr, outlen, inbuf);
+ conv_euctoutf8(outbuf, outlen, eucstr);
+}
+
+static void conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+{
+ gchar *tmpstr;
+
+ tmpstr = conv_iconv_strdup(inbuf, CS_SHIFT_JIS, CS_UTF_8);
+ if (tmpstr) {
+ strncpy2(outbuf, tmpstr, outlen);
+ g_free(tmpstr);
+ } else
strncpy2(outbuf, inbuf, outlen);
- break;
- }
}
-void conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- gchar *tmpstr = NULL;
+ static iconv_t cd = (iconv_t)-1;
+ static gboolean iconv_ok = TRUE;
+ gchar *tmpstr;
+
+ if (cd == (iconv_t)-1) {
+ if (!iconv_ok) {
+ strncpy2(outbuf, inbuf, outlen);
+ return;
+ }
+ 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_strerror(errno));
+ iconv_ok = FALSE;
+ strncpy2(outbuf, inbuf, outlen);
+ return;
+ }
+ }
+ }
- switch (conv_guess_ja_encoding(inbuf)) {
- case C_ISO_2022_JP:
- tmpstr = conv_codeset_strdup(inbuf, CS_ISO_2022_JP, CS_UTF_8);
+ tmpstr = conv_iconv_strdup_with_cd(inbuf, cd);
+ if (tmpstr) {
strncpy2(outbuf, tmpstr, outlen);
g_free(tmpstr);
+ } else
+ strncpy2(outbuf, inbuf, outlen);
+}
+
+static void conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
+{
+ switch (conv_guess_ja_encoding(inbuf)) {
+ case C_ISO_2022_JP:
+ conv_jistoutf8(outbuf, outlen, inbuf);
break;
case C_SHIFT_JIS:
- tmpstr = conv_codeset_strdup(inbuf, CS_SHIFT_JIS, CS_UTF_8);
- strncpy2(outbuf, tmpstr, outlen);
- g_free(tmpstr);
+ conv_sjistoutf8(outbuf, outlen, inbuf);
break;
case C_EUC_JP:
- tmpstr = conv_codeset_strdup(inbuf, CS_EUC_JP, CS_UTF_8);
- strncpy2(outbuf, tmpstr, outlen);
- g_free(tmpstr);
+ conv_euctoutf8(outbuf, outlen, inbuf);
break;
default:
strncpy2(outbuf, inbuf, outlen);
}
}
-void conv_anytojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- switch (conv_guess_ja_encoding(inbuf)) {
- case C_EUC_JP:
- conv_euctojis(outbuf, outlen, inbuf);
- break;
- default:
- strncpy2(outbuf, inbuf, outlen);
- break;
+ static iconv_t cd = (iconv_t)-1;
+ static gboolean iconv_ok = TRUE;
+ gchar *tmpstr;
+
+ if (cd == (iconv_t)-1) {
+ if (!iconv_ok) {
+ strncpy2(outbuf, inbuf, outlen);
+ return;
+ }
+ 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_strerror(errno));
+ iconv_ok = FALSE;
+ strncpy2(outbuf, inbuf, outlen);
+ return;
+ }
+ }
}
+
+ tmpstr = conv_iconv_strdup_with_cd(inbuf, cd);
+ if (tmpstr) {
+ strncpy2(outbuf, tmpstr, outlen);
+ g_free(tmpstr);
+ } else
+ strncpy2(outbuf, inbuf, outlen);
+}
+
+static void 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] = {
return TRUE;
}
-void conv_unreadable_eucjp(gchar *str)
+static void conv_unreadable_eucjp(gchar *str)
{
register guchar *p = str;
while (*p != '\0') {
- if (isascii(*p)) {
+ if (IS_ASCII(*p)) {
/* convert CR+LF -> LF */
if (*p == '\r' && *(p + 1) == '\n')
memmove(p, p + 1, strlen(p));
/* substitute unprintable code */
*p++ = SUBST_CHAR;
if (*p != '\0') {
- if (isascii(*p))
+ if (IS_ASCII(*p))
p++;
else
*p++ = SUBST_CHAR;
}
}
-void conv_unreadable_8bit(gchar *str)
+static void conv_unreadable_8bit(gchar *str)
{
register guchar *p = str;
/* convert CR+LF -> LF */
if (*p == '\r' && *(p + 1) == '\n')
memmove(p, p + 1, strlen(p));
- else if (!isascii(*p)) *p = SUBST_CHAR;
+ else if (!IS_ASCII(*p)) *p = SUBST_CHAR;
p++;
}
}
-void conv_unreadable_latin(gchar *str)
+static void conv_unreadable_latin(gchar *str)
{
register guchar *p = str;
/* convert CR+LF -> LF */
if (*p == '\r' && *(p + 1) == '\n')
memmove(p, p + 1, strlen(p));
- else if ((*p & 0xff) >= 0x7f && (*p & 0xff) <= 0x9f)
+ else if ((*p & 0xff) >= 0x7f)
*p = SUBST_CHAR;
p++;
}
}
-void conv_unreadable_locale(gchar *str)
-{
- switch (conv_get_current_charset()) {
- case C_US_ASCII:
- case C_ISO_8859_1:
- case C_ISO_8859_2:
- case C_ISO_8859_3:
- case C_ISO_8859_4:
- case C_ISO_8859_5:
- case C_ISO_8859_6:
- case C_ISO_8859_7:
- case C_ISO_8859_8:
- case C_ISO_8859_9:
- case C_ISO_8859_10:
- case C_ISO_8859_11:
- case C_ISO_8859_13:
- case C_ISO_8859_14:
- case C_ISO_8859_15:
- conv_unreadable_latin(str);
- break;
- case C_EUC_JP:
- conv_unreadable_eucjp(str);
- break;
- default:
- break;
- }
-}
-
#define NCV '\0'
void conv_mb_alnum(gchar *str)
if (guessed == C_US_ASCII)
return C_ISO_2022_JP;
p += 2;
- } else if (isascii(*p)) {
+ } else if (IS_ASCII(*p)) {
p++;
} else if (iseuckanji(*p) && iseuckanji(*(p + 1))) {
if (*p >= 0xfd && *p <= 0xfe)
return guessed;
}
-void conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_jistoeuc(outbuf, outlen, inbuf);
- conv_unreadable_eucjp(outbuf);
+ conv_jistoutf8(outbuf, outlen, inbuf);
}
-void conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_sjistoeuc(outbuf, outlen, inbuf);
- conv_unreadable_eucjp(outbuf);
+ conv_sjistoutf8(outbuf, outlen, inbuf);
}
-void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- strncpy2(outbuf, inbuf, outlen);
- conv_unreadable_eucjp(outbuf);
+ conv_euctoutf8(outbuf, outlen, inbuf);
}
-void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+void conv_utf8todisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- conv_anytoutf8(outbuf, outlen, inbuf);
+ strncpy2(outbuf, inbuf, outlen);
}
-#warning FIXME_GTK2
-void conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- strncpy2(outbuf, inbuf, outlen);
- conv_unreadable_8bit(outbuf);
+ conv_anytoutf8(outbuf, outlen, inbuf);
}
-#warning FIXME_GTK2
-void conv_latintodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
strncpy2(outbuf, inbuf, outlen);
- conv_unreadable_latin(outbuf);
+ conv_unreadable_8bit(outbuf);
}
-#warning FIXME_GTK2
void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
- strncpy2(outbuf, inbuf, outlen);
- conv_unreadable_locale(outbuf);
+ gchar *tmpstr;
+
+ tmpstr = conv_iconv_strdup(inbuf, conv_get_locale_charset_str(),
+ CS_INTERNAL);
+ if (tmpstr) {
+ strncpy2(outbuf, tmpstr, outlen);
+ g_free(tmpstr);
+ } else
+ strncpy2(outbuf, inbuf, outlen);
}
-void conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
+static void conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
{
strncpy2(outbuf, inbuf, outlen);
}
-CodeConverter *conv_code_converter_new(const gchar *charset)
+CodeConverter *conv_code_converter_new(const gchar *src_charset)
{
CodeConverter *conv;
conv = g_new0(CodeConverter, 1);
- conv->code_conv_func = conv_get_code_conv_func(charset, CS_UTF_8);
- conv->charset_str = g_strdup(charset);
- conv->charset = conv_get_charset_from_str(charset);
+ conv->code_conv_func = conv_get_code_conv_func(src_charset, NULL);
+ conv->charset_str = g_strdup(src_charset);
+ conv->charset = conv_get_charset_from_str(src_charset);
return conv;
}
else {
gchar *str;
- str = conv_iconv_strdup(inbuf, conv->charset_str, CS_UTF_8);
+ str = conv_iconv_strdup(inbuf, conv->charset_str, NULL);
if (!str)
return -1;
else {
CharSet dest_charset;
if (!src_charset_str)
- src_charset = conv_get_current_charset();
+ src_charset = conv_get_locale_charset();
else
src_charset = conv_get_charset_from_str(src_charset_str);
if (dest_charset == C_US_ASCII)
return conv_ustodisp;
- else if (dest_charset == C_UTF_8 ||
- (dest_charset == C_AUTO &&
- conv_get_current_charset() == C_UTF_8))
- return conv_noconv;
switch (src_charset) {
- case C_ISO_2022_JP:
- case C_ISO_2022_JP_2:
- case C_ISO_2022_JP_3:
- if (dest_charset == C_AUTO &&
- conv_get_current_charset() == C_EUC_JP)
- code_conv = conv_jistodisp;
- else if (dest_charset == C_EUC_JP)
- code_conv = conv_jistoeuc;
- break;
case C_US_ASCII:
- if (dest_charset == C_AUTO)
- code_conv = conv_ustodisp;
- break;
case C_ISO_8859_1:
case C_ISO_8859_2:
case C_ISO_8859_3:
case C_ISO_8859_13:
case C_ISO_8859_14:
case C_ISO_8859_15:
- if (dest_charset == C_AUTO &&
- (conv_get_current_charset() == src_charset ||
- MB_CUR_MAX > 1))
- code_conv = conv_latintodisp;
+ break;
+ case C_ISO_2022_JP:
+ case C_ISO_2022_JP_2:
+ case C_ISO_2022_JP_3:
+ if (dest_charset == C_AUTO)
+ code_conv = conv_jistodisp;
+ else if (dest_charset == C_EUC_JP)
+ code_conv = conv_jistoeuc;
+ else if (dest_charset == C_UTF_8)
+ code_conv = conv_jistoutf8;
break;
case C_SHIFT_JIS:
- if (dest_charset == C_AUTO &&
- conv_get_current_charset() == C_EUC_JP)
+ if (dest_charset == C_AUTO)
code_conv = conv_sjistodisp;
else if (dest_charset == C_EUC_JP)
code_conv = conv_sjistoeuc;
+ else if (dest_charset == C_UTF_8)
+ code_conv = conv_sjistoutf8;
break;
case C_EUC_JP:
- if (dest_charset == C_AUTO &&
- conv_get_current_charset() == C_EUC_JP)
+ if (dest_charset == C_AUTO)
code_conv = conv_euctodisp;
else if (dest_charset == C_ISO_2022_JP ||
dest_charset == C_ISO_2022_JP_2 ||
dest_charset == C_ISO_2022_JP_3)
code_conv = conv_euctojis;
+ else if (dest_charset == C_UTF_8)
+ code_conv = conv_euctoutf8;
+ break;
+ case C_UTF_8:
+ if (dest_charset == C_EUC_JP)
+ code_conv = conv_utf8toeuc;
+ else if (dest_charset == C_ISO_2022_JP ||
+ dest_charset == C_ISO_2022_JP_2 ||
+ dest_charset == C_ISO_2022_JP_3)
+ code_conv = conv_utf8tojis;
break;
default:
break;
}
gchar *conv_iconv_strdup(const gchar *inbuf,
- const gchar *isrc_code, const gchar *idest_code)
+ const gchar *src_code, const gchar *dest_code)
{
- /* presumably GLib 2's function handles the conversion details,
- * whether iconv is sitting below, or something else */
+ iconv_t cd;
gchar *outbuf;
- gsize read_len, written_len;
- gchar *src_code = (char *)conv_get_outgoing_charset_str();
- gchar *dest_code = (char *)conv_get_current_charset_str();
-
- if (isrc_code)
- src_code = (char *)isrc_code;
- if (idest_code)
- dest_code = (char *)idest_code;
- /* don't convert if current codeset is US-ASCII */
- if (!strcasecmp(dest_code, CS_US_ASCII))
- return g_strdup(inbuf);
+ if (!src_code)
+ src_code = conv_get_outgoing_charset_str();
+ if (!dest_code)
+ dest_code = CS_INTERNAL;
/* don't convert if src and dest codeset are identical */
if (!strcasecmp(src_code, dest_code))
return g_strdup(inbuf);
- /* FIXME: unchecked inbuf? Can't see at this level. */
- outbuf = g_convert(inbuf, strlen(inbuf), dest_code, src_code,
- &read_len, &written_len, NULL);
+ /* don't convert if current codeset is US-ASCII */
+ if (!strcasecmp(dest_code, CS_US_ASCII))
+ return g_strdup(inbuf);
+
+ cd = iconv_open(dest_code, src_code);
+ if (cd == (iconv_t)-1)
+ return NULL;
+
+ outbuf = conv_iconv_strdup_with_cd(inbuf, cd);
+
+ iconv_close(cd);
+
+ return outbuf;
+}
+
+gchar *conv_iconv_strdup_with_cd(const gchar *inbuf, iconv_t cd)
+{
+ const gchar *inbuf_p;
+ gchar *outbuf;
+ gchar *outbuf_p;
+ size_t in_size;
+ size_t in_left;
+ size_t out_size;
+ size_t out_left;
+ size_t n_conv;
+ size_t len;
+
+ inbuf_p = inbuf;
+ in_size = strlen(inbuf);
+ in_left = in_size;
+ out_size = (in_size + 1) * 2;
+ outbuf = g_malloc(out_size);
+ outbuf_p = outbuf;
+ out_left = out_size;
+
+#define EXPAND_BUF() \
+{ \
+ len = outbuf_p - outbuf; \
+ out_size *= 2; \
+ outbuf = g_realloc(outbuf, out_size); \
+ outbuf_p = outbuf + len; \
+ out_left = out_size - len; \
+}
+
+ while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
+ &outbuf_p, &out_left)) == (size_t)-1) {
+ if (EILSEQ == errno) {
+ //g_print("iconv(): at %d: %s\n", in_size - in_left, g_strerror(errno));
+ inbuf_p++;
+ in_left--;
+ if (out_left == 0) {
+ EXPAND_BUF();
+ }
+ *outbuf_p++ = SUBST_CHAR;
+ out_left--;
+ } else if (EINVAL == errno) {
+ break;
+ } else if (E2BIG == errno) {
+ EXPAND_BUF();
+ } else {
+ g_warning("conv_iconv_strdup(): %s\n",
+ g_strerror(errno));
+ break;
+ }
+ }
+
+ while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) ==
+ (size_t)-1) {
+ if (E2BIG == errno) {
+ EXPAND_BUF();
+ } else {
+ g_warning("conv_iconv_strdup(): %s\n",
+ g_strerror(errno));
+ break;
+ }
+ }
+
+#undef EXPAND_BUF
- if (outbuf == NULL)
- g_warning(_("Valid locale type set? (Currently: %s to %s)\n"),
- src_code, dest_code);
-
- return outbuf;
+ len = outbuf_p - outbuf;
+ outbuf = g_realloc(outbuf, len + 1);
+ outbuf[len] = '\0';
+
+ return outbuf;
}
static const struct {
{C_ISO_2022_JP_3, CS_ISO_2022_JP_3},
{C_EUC_JP, CS_EUC_JP},
{C_EUC_JP, CS_EUCJP},
+ {C_EUC_JP_MS, CS_EUC_JP_MS},
{C_SHIFT_JIS, CS_SHIFT_JIS},
{C_SHIFT_JIS, CS_SHIFT__JIS},
{C_SHIFT_JIS, CS_SJIS},
return GPOINTER_TO_UINT(g_hash_table_lookup(table, charset));
}
-CharSet conv_get_current_charset(void)
+CharSet conv_get_locale_charset(void)
{
static CharSet cur_charset = -1;
const gchar *cur_locale;
/* "ja_JP.EUC" matches with "ja_JP.eucJP", "ja_JP.EUC" and
"ja_JP". "ja_JP" matches with "ja_JP.xxxx" and "ja" */
- if (!strncasecmp(cur_locale, locale_table[i].locale,
+ 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 &&
- !strncasecmp(cur_locale, locale_table[i].locale, 2)) {
+ !g_ascii_strncasecmp(cur_locale, locale_table[i].locale, 2)) {
cur_charset = locale_table[i].charset;
return cur_charset;
}
return cur_charset;
}
-const gchar *conv_get_current_charset_str(void)
+const gchar *conv_get_locale_charset_str(void)
{
static const gchar *codeset = NULL;
if (!codeset)
- codeset = conv_get_charset_str(conv_get_current_charset());
+ codeset = conv_get_charset_str(conv_get_locale_charset());
- return codeset ? codeset : CS_US_ASCII;
+ return codeset ? codeset : CS_INTERNAL;
+}
+
+CharSet conv_get_internal_charset(void)
+{
+ return C_INTERNAL;
+}
+
+const gchar *conv_get_internal_charset_str(void)
+{
+ return CS_INTERNAL;
}
CharSet conv_get_outgoing_charset(void)
for (i = 0; i < sizeof(locale_table) / sizeof(locale_table[0]); i++) {
const gchar *p;
- if (!strncasecmp(cur_locale, locale_table[i].locale,
+ if (!g_ascii_strncasecmp(cur_locale, locale_table[i].locale,
strlen(locale_table[i].locale))) {
out_charset = locale_table[i].out_charset;
break;
} else if ((p = strchr(locale_table[i].locale, '_')) &&
!strchr(p + 1, '.')) {
if (strlen(cur_locale) == 2 &&
- !strncasecmp(cur_locale, locale_table[i].locale, 2)) {
+ !g_ascii_strncasecmp(cur_locale, locale_table[i].locale, 2)) {
out_charset = locale_table[i].out_charset;
break;
}
out_charset = conv_get_outgoing_charset();
str = conv_get_charset_str(out_charset);
- return str ? str : CS_US_ASCII;
+ 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:
const gchar *cur_locale;
cur_locale = g_getenv("LC_ALL");
- if (!cur_locale || !strlen(cur_locale))
- cur_locale = g_getenv("LC_CTYPE");
- if (!cur_locale || !strlen(cur_locale))
- cur_locale = g_getenv("LANG");
- if (!cur_locale || !strlen(cur_locale))
- cur_locale = setlocale(LC_CTYPE, NULL);
+ 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);
-/* debug_print("current locale: %s\n",
- cur_locale ? cur_locale : "(none)"); */
+ debug_print("current locale: %s\n",
+ cur_locale ? cur_locale : "(none)");
return cur_locale;
}
gchar *buf;
gint buflen;
CharSet cur_charset;
- const gchar *locale;
-
- g_return_if_fail(str != NULL);
-
- cur_charset = conv_get_current_charset();
-#warning FIXME_GTK2
-/* Should we always ensure to convert? */
- locale = conv_get_current_locale();
+ cur_charset = conv_get_locale_charset();
- if (locale && !strncasecmp(locale, "ja", 2)) {
+ if (cur_charset == C_EUC_JP) {
buflen = strlen(str) * 2 + 1;
Xalloca(buf, buflen, return);
conv_anytodisp(buf, buflen, str);
const gchar *charset)
{
CharSet cur_charset;
- const gchar *locale;
- cur_charset = conv_get_current_charset();
+ cur_charset = conv_get_locale_charset();
-#warning FIXME_GTK2
-/* Should we always ensure to convert? */
- locale = conv_get_current_locale();
-
- if (locale && !strncasecmp(locale, "ja", 2)) {
+ if (cur_charset == C_EUC_JP) {
gchar *buf;
gint buflen;
Xalloca(buf, buflen, return);
conv_anytodisp(buf, buflen, str);
unmime_header(outbuf, buf);
- } else if (g_utf8_validate(str, -1, NULL)) {
- unmime_header(outbuf, str);
} else {
- gchar *buf;
- gint buflen;
- const gchar *src_codeset, *dest_codeset;
- src_codeset = conv_get_current_charset_str();
- dest_codeset = CS_UTF_8;
- buf = conv_codeset_strdup(str, src_codeset, dest_codeset);
- unmime_header(outbuf, buf);
+ 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);
+ }
+ }
}
+
}
#define MAX_LINELEN 76
#define MIMESEP_BEGIN "=?"
#define MIMESEP_END "?="
-#define B64LEN(len) ((len) / 3 * 4 + ((len) % 3 ? 4 : 0))
-
#define LBREAK_IF_REQUIRED(cond, is_plain_text) \
{ \
if (len - (destp - (guchar *)dest) < MAX_LINELEN + 2) { \
const guchar *srcp = src;
guchar *destp = dest;
gboolean use_base64;
- gchar *testbuf;
-
+
+ g_return_if_fail(g_utf8_validate(src, -1, NULL) == TRUE);
+
if (MB_CUR_MAX > 1) {
use_base64 = TRUE;
mimesep_enc = "?B?";
mimesep_enc = "?Q?";
}
- cur_encoding = CS_UTF_8; /* gtk2 */
-
+ cur_encoding = CS_INTERNAL;
out_encoding = conv_get_outgoing_charset_str();
if (!strcmp(out_encoding, CS_US_ASCII))
out_encoding = CS_ISO_8859_1;
- testbuf = conv_codeset_strdup(src, cur_encoding, out_encoding);
-
- if (testbuf != NULL)
- g_free(testbuf);
- else
- out_encoding = CS_UTF_8;
-
mimestr_len = strlen(MIMESEP_BEGIN) + strlen(out_encoding) +
strlen(mimesep_enc) + strlen(MIMESEP_END);
if (addr_field && (*p == '(' || *p == ')'))
break;
- if (MB_CUR_MAX > 1) {
- mb_len = mblen(p, MB_CUR_MAX);
- if (mb_len < 0) {
- g_warning("conv_encode_header(): invalid multibyte character encountered\n");
- mb_len = 1;
- }
- } else
- mb_len = 1;
+ mb_len = g_utf8_skip[*p];
Xstrndup_a(part_str, srcp, cur_len + mb_len, );
out_str = conv_codeset_strdup
projects / claws.git / blobdiff