sync with 0.8.10cvs11

[claws.git] / src / codeconv.c

diff --git a/src/codeconv.c b/src/codeconv.c
index 4d4a0a1b4fdef152864950b72a85689fe3fdc779..fa1bb18b1d112aacfb90fcecfda5cb2210e3505e 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -370,7 +370,7 @@ static gchar valid_eucjp_tbl[][96] = {
 
 static gboolean isprintableeuckanji(guchar c1, guchar c2)
 {
-       if (c1 <= 0xa0 || c1 == 0xff)
+       if (c1 <= 0xa0 || c1 >= 0xf5)
                return FALSE;
        if (c2 <= 0xa0 || c2 == 0xff)
                return FALSE;
@@ -456,7 +456,7 @@ void conv_unreadable_latin(gchar *str)
                /* convert CR+LF -> LF */
                if (*p == '\r' && *(p + 1) == '\n')
                        memmove(p, p + 1, strlen(p));
-               else if ((*p & 0xff) >= 0x80 && (*p & 0xff) <= 0x9f)
+               else if ((*p & 0xff) >= 0x7f && (*p & 0xff) <= 0x9f)
                        *p = SUBST_CHAR;
                p++;
        }
@@ -633,7 +633,6 @@ void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
                conv_unreadable_eucjp(outbuf);
                break;
        default:
-               conv_unreadable_8bit(outbuf);
                break;
        }
 }
@@ -961,36 +960,88 @@ static const struct {
        {"ANSI_X3.4-1968"       , C_US_ASCII    , C_US_ASCII},
 };
 
-const gchar *conv_get_charset_str(CharSet charset)
+static GHashTable *conv_get_charset_to_str_table(void)
 {
+       static GHashTable *table;
        gint i;
 
+       if (table)
+               return table;
+
+       table = g_hash_table_new(NULL, g_direct_equal);
+
        for (i = 0; i < sizeof(charsets) / sizeof(charsets[0]); i++) {
-               if (charsets[i].charset == charset)
-                       return charsets[i].name;
+               if (g_hash_table_lookup(table, GUINT_TO_POINTER(charsets[i].charset))
+                   == NULL) {
+                       g_hash_table_insert
+                               (table, GUINT_TO_POINTER(charsets[i].charset),
+                                charsets[i].name);
+               }
        }
 
-       return NULL;
+       return table;
 }
 
-CharSet conv_get_charset_from_str(const gchar *charset)
+static gint str_case_equal(gconstpointer v, gconstpointer v2)
 {
+       return strcasecmp((const gchar *)v, (const gchar *)v2) == 0;
+}
+
+static guint str_case_hash(gconstpointer key)
+{
+       const gchar *p = key;
+       guint h = *p;
+
+       if (h) {
+               h = tolower(h);
+               for (p += 1; *p != '\0'; p++)
+                       h = (h << 5) - h + tolower(*p);
+       }
+
+       return h;
+}
+
+static GHashTable *conv_get_charset_from_str_table(void)
+{
+       static GHashTable *table;
        gint i;
 
-       if (!charset) return C_AUTO;
+       if (table)
+               return table;
+
+       table = g_hash_table_new(str_case_hash, str_case_equal);
 
        for (i = 0; i < sizeof(charsets) / sizeof(charsets[0]); i++) {
-               if (!strcasecmp(charsets[i].name, charset))
-                       return charsets[i].charset;
+               g_hash_table_insert(table, charsets[i].name,
+                                   GUINT_TO_POINTER(charsets[i].charset));
        }
 
-       return C_AUTO;
+       return table;
+}
+
+const gchar *conv_get_charset_str(CharSet charset)
+{
+       GHashTable *table;
+
+       table = conv_get_charset_to_str_table();
+       return g_hash_table_lookup(table, GUINT_TO_POINTER(charset));
+}
+
+CharSet conv_get_charset_from_str(const gchar *charset)
+{
+       GHashTable *table;
+
+       if (!charset) return C_AUTO;
+
+       table = conv_get_charset_from_str_table();
+       return GPOINTER_TO_UINT(g_hash_table_lookup(table, charset));
 }
 
 CharSet conv_get_current_charset(void)
 {
        static CharSet cur_charset = -1;
        const gchar *cur_locale;
+       const gchar *p;
        gint i;
 
        if (cur_charset != -1)
@@ -1007,6 +1058,11 @@ CharSet conv_get_current_charset(void)
                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;
 
@@ -1037,13 +1093,14 @@ const gchar *conv_get_current_charset_str(void)
        if (!codeset)
                codeset = conv_get_charset_str(conv_get_current_charset());
 
-       return codeset ? codeset : "US-ASCII";
+       return codeset ? codeset : CS_US_ASCII;
 }
 
 CharSet conv_get_outgoing_charset(void)
 {
        static CharSet out_charset = -1;
        const gchar *cur_locale;
+       const gchar *p;
        gint i;
 
        if (out_charset != -1)
@@ -1055,6 +1112,11 @@ CharSet conv_get_outgoing_charset(void)
                return out_charset;
        }
 
+       if ((p = strcasestr(cur_locale, "@euro")) && p[5] == '\0') {
+               out_charset = C_ISO_8859_15;
+               return out_charset;
+       }
+
        for (i = 0; i < sizeof(locale_table) / sizeof(locale_table[0]); i++) {
                const gchar *p;
 
@@ -1100,7 +1162,7 @@ const gchar *conv_get_outgoing_charset_str(void)
        out_charset = conv_get_outgoing_charset();
        str = conv_get_charset_str(out_charset);
 
-       return str ? str : "US-ASCII";
+       return str ? str : CS_US_ASCII;
 }
 
 const gchar *conv_get_current_locale(void)
@@ -1172,14 +1234,16 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
        }                                                       \
                                                                \
        if ((cond) && *srcp) {                                  \
-               if (destp > dest && isspace(*(destp - 1)))      \
-                       destp--;                                \
-               else if (plaintext && isspace(*srcp))           \
-                       srcp++;                                 \
-               if (*srcp) {                                    \
-                       *destp++ = '\n';                        \
-                       *destp++ = ' ';                         \
-                       left = MAX_LINELEN - 1;                 \
+               if (destp > dest && left < MAX_LINELEN - 1) {   \
+                       if (isspace(*(destp - 1)))              \
+                               destp--;                        \
+                       else if (plaintext && isspace(*srcp))   \
+                               srcp++;                         \
+                       if (*srcp) {                            \
+                               *destp++ = '\n';                \
+                               *destp++ = ' ';                 \
+                               left = MAX_LINELEN - 1;         \
+                       }                                       \
                }                                               \
        }                                                       \
 }
@@ -1205,11 +1269,11 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
        }
 
        cur_encoding = conv_get_current_charset_str();
-       if (!strcmp(cur_encoding, "US-ASCII"))
-               cur_encoding = "ISO-8859-1";
+       if (!strcmp(cur_encoding, CS_US_ASCII))
+               cur_encoding = CS_ISO_8859_1;
        out_encoding = conv_get_outgoing_charset_str();
-       if (!strcmp(out_encoding, "US-ASCII"))
-               out_encoding = "ISO-8859-1";
+       if (!strcmp(out_encoding, CS_US_ASCII))
+               out_encoding = CS_ISO_8859_1;
 
        mimestr_len = strlen(MIMESEP_BEGIN) + strlen(out_encoding) +
                strlen(mimesep_enc) + strlen(MIMESEP_END);
@@ -1232,7 +1296,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                        word_len = get_next_word_len(srcp);
                        LBREAK_IF_REQUIRED(left < word_len, TRUE);
                        while (word_len > 0) {
-                               LBREAK_IF_REQUIRED(left <= 0, TRUE);
+                               LBREAK_IF_REQUIRED(left + 22 <= 0, TRUE);
                                *destp++ = *srcp++;
                                left--;
                                word_len--;
@@ -1271,7 +1335,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                        (part_str, cur_encoding, out_encoding);
                                if (!out_str) {
                                        g_warning("conv_encode_header(): code conversion failed\n");
-                                       out_str = g_strdup(out_str);
+                                       conv_unreadable_8bit(part_str);
+                                       out_str = g_strdup(part_str);
                                }
                                out_str_len = strlen(out_str);
 
@@ -1301,7 +1366,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                        (part_str, cur_encoding, out_encoding);
                                if (!out_str) {
                                        g_warning("conv_encode_header(): code conversion failed\n");
-                                       out_str = g_strdup(out_str);
+                                       conv_unreadable_8bit(part_str);
+                                       out_str = g_strdup(part_str);
                                }
                                out_str_len = strlen(out_str);