+/*
+ * 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 (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * Copyright © 2006 Pierre Habouzit
+ */
/*
* Copyright notice from original mutt:
* Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
char *Charset;
int Charset_is_utf8 = 0;
+wchar_t CharsetReplacement = '?';
-/*
- * The following list has been created manually from the data under:
- * http://www.isi.edu/in-notes/iana/assignments/character-sets
- * Last update: 2000-09-07
- *
- * Note that it includes only the subset of character sets for which
- * a preferred MIME name is given.
- */
-
-static struct {
- const char *key;
- const char *pref;
-} PreferredMIMENames[] = {
- {"ansi_x3.4-1968", "us-ascii"},
- {"iso-ir-6", "us-ascii"},
- {"iso_646.irv:1991", "us-ascii"},
- {"ascii", "us-ascii"},
- {"iso646-us", "us-ascii"},
- {"us", "us-ascii"},
- {"ibm367", "us-ascii"},
- {"cp367", "us-ascii"},
- {"csascii", "us-ascii"},
- {"csiso2022kr", "iso-2022-kr"},
- {"cseuckr", "euc-kr"},
- {"csiso2022jp", "iso-2022-jp"},
- {"csiso2022jp2", "iso-2022-jp-2"},
- {"iso_8859-1:1987", "iso-8859-1"},
- {"iso-ir-100", "iso-8859-1"},
- {"iso_8859-1", "iso-8859-1"},
- {"latin1", "iso-8859-1"},
- {"l1", "iso-8859-1"},
- {"ibm819", "iso-8859-1"},
- {"cp819", "iso-8859-1"},
- {"csisolatin1", "iso-8859-1"},
- {"iso_8859-2:1987", "iso-8859-2"},
- {"iso-ir-101", "iso-8859-2"},
- {"iso_8859-2", "iso-8859-2"},
- {"latin2", "iso-8859-2"},
- {"l2", "iso-8859-2"},
- {"csisolatin2", "iso-8859-2"},
- {"iso_8859-3:1988", "iso-8859-3"},
- {"iso-ir-109", "iso-8859-3"},
- {"iso_8859-3", "iso-8859-3"},
- {"latin3", "iso-8859-3"},
- {"l3", "iso-8859-3"},
- {"csisolatin3", "iso-8859-3"},
- {"iso_8859-4:1988", "iso-8859-4"},
- {"iso-ir-110", "iso-8859-4"},
- {"iso_8859-4", "iso-8859-4"},
- {"latin4", "iso-8859-4"},
- {"l4", "iso-8859-4"},
- {"csisolatin4", "iso-8859-4"},
- {"iso_8859-6:1987", "iso-8859-6"},
- {"iso-ir-127", "iso-8859-6"},
- {"iso_8859-6", "iso-8859-6"},
- {"ecma-114", "iso-8859-6"},
- {"asmo-708", "iso-8859-6"},
- {"arabic", "iso-8859-6"},
- {"csisolatinarabic", "iso-8859-6"},
- {"iso_8859-7:1987", "iso-8859-7"},
- {"iso-ir-126", "iso-8859-7"},
- {"iso_8859-7", "iso-8859-7"},
- {"elot_928", "iso-8859-7"},
- {"ecma-118", "iso-8859-7"},
- {"greek", "iso-8859-7"},
- {"greek8", "iso-8859-7"},
- {"csisolatingreek", "iso-8859-7"},
- {"iso_8859-8:1988", "iso-8859-8"},
- {"iso-ir-138", "iso-8859-8"},
- {"iso_8859-8", "iso-8859-8"},
- {"hebrew", "iso-8859-8"},
- {"csisolatinhebrew", "iso-8859-8"},
- {"iso_8859-5:1988", "iso-8859-5"},
- {"iso-ir-144", "iso-8859-5"},
- {"iso_8859-5", "iso-8859-5"},
- {"cyrillic", "iso-8859-5"},
- {"csisolatincyrillic", "iso8859-5"},
- {"iso_8859-9:1989", "iso-8859-9"},
- {"iso-ir-148", "iso-8859-9"},
- {"iso_8859-9", "iso-8859-9"},
- {"latin5", "iso-8859-9"},
- {"l5", "iso-8859-9"},
- {"csisolatin5", "iso-8859-9"},
- {"iso_8859-10:1992", "iso-8859-10"},
- {"iso-ir-157", "iso-8859-10"},
- {"latin6", "iso-8859-10"},
- {"l6", "iso-8859-10"},
- {"csisolatin6", "iso-8859-10"},
- {"cskoi8r", "koi8-r"},
- {"ms_kanji", "shift_jis"},
- {"csshiftjis", "shift_jis"},
- {"extended_unix_code_packed_format_for_japanese", "euc-jp"},
- {"cseucpkdfmtjapanese", "euc-jp"},
- {"csgb2312", "gb2312"},
- {"csbig5", "big5"},
- /* end of official brain damage.
- what follows has been taken * from glibc's localedata files. */
- {"iso_8859-13", "iso-8859-13"},
- {"iso-ir-179", "iso-8859-13"},
- {"latin7", "iso-8859-13"},
- {"l7", "iso-8859-13"},
- {"iso_8859-14", "iso-8859-14"},
- {"latin8", "iso-8859-14"},
- {"l8", "iso-8859-14"},
- {"iso_8859-15", "iso-8859-15"},
- {"latin9", "iso-8859-15"},
- {"latin0", "iso-8859-15"},
- {"iso_8859-16", "iso-8859-16"},
- {"latin10", "iso-8859-16"},
- {"646", "us-ascii"},
- {"eucjp", "euc-jp"},
- {"pck", "shift_jis"},
- {"ko_kr-euc", "euc-kr"},
- {"zh_tw-big5", "big5"},
- {"sjis", "shift_jis"},
- {"euc-jp-ms", "eucjp-ms"},
- {NULL, NULL}
-};
-
-void mutt_set_langinfo_charset (void)
+void charset_initialize(void)
{
#ifdef HAVE_LANGINFO_CODESET
char buff[LONG_STRING];
char buff2[LONG_STRING];
m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET));
- mutt_canonical_charset(buff2, sizeof(buff2), buff);
+ charset_canonicalize(buff2, sizeof(buff2), buff);
/* finally, set $charset */
- if (!(Charset = m_strdup(buff2)))
+ if (!m_strisempty(buff2)) {
+ m_strreplace(&Charset, buff2);
+ } else
#endif
- Charset = m_strdup("iso-8859-1");
-}
+ {
+ m_strreplace(&Charset, "iso-8859-1");
+ }
+ Charset_is_utf8 = !strcmp(Charset, "utf-8");
+ CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
+
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+ bind_textdomain_codeset(PACKAGE, Charset);
+#endif
+}
-void mutt_canonical_charset(char *dest, ssize_t dlen, const char *name)
+#include "charset.gperf"
+void charset_canonicalize(char *dest, ssize_t dlen, const char *name)
{
- ssize_t i;
- char *p;
+ const struct cset_pair *cp;
char scratch[LONG_STRING];
+ const char *p;
+ int i = 0;
- m_strcpy(scratch, sizeof(scratch), name);
- m_strtolower(scratch);
-
- /* catch some common iso-8859-something misspellings */
- if (!strncmp(scratch, "8859", 4)) {
- snprintf(scratch, sizeof(scratch), "iso-8859-%s",
- name + 4 + (name[4] == '-'));
- m_strtolower(scratch);
- } else
- if (!strncmp(scratch, "iso8859", 7)) {
- snprintf(scratch, sizeof(scratch), "iso-8859-%s",
- name + 7 + (name[7] == '-'));
- m_strtolower(scratch);
- }
-
- for (i = 0; PreferredMIMENames[i].key; i++) {
- if (!strcmp(scratch, PreferredMIMENames[i].key)) {
- m_strcpy(dest, dlen, PreferredMIMENames[i].pref);
- return;
+ // canonize name: only keep a-z0-9 and dots, put into lowercase
+ for (p = name; *p && *p != ':' && i < ssizeof(scratch) - 1; p++) {
+ if (isalnum(*p) || *p== '.') {
+ scratch[i++] = tolower((unsigned char)*p);
}
}
-
- m_strcpy(dest, dlen, scratch);
+ scratch[i] = '\0';
+
+ cp = charset_canonicalize_aux(scratch, strlen(scratch));
+ if (cp) {
+ m_strcpy(dest, dlen, cp->pref);
+ } else {
+ m_strcpy(dest, dlen, name);
+ m_strtolower(dest);
+ }
}
static int mutt_chscmp(const char *s, const char *chs)
if (!s)
return 0;
- mutt_canonical_charset(buffer, sizeof(buffer), s);
+ charset_canonicalize(buffer, sizeof(buffer), s);
return !strcmp(buffer, chs);
}
-int mutt_is_utf8(const char *s)
+int charset_is_utf8(const char *s)
{
return mutt_chscmp(s, "utf-8");
}
-int mutt_is_us_ascii(const char *s)
+int charset_is_us_ascii(const char *s)
{
return mutt_chscmp(s, "us-ascii");
}
iconv_t cd;
- mutt_canonical_charset (tocode1, sizeof (tocode1), tocode);
+ charset_canonicalize (tocode1, sizeof (tocode1), tocode);
#ifdef M_ICONV_HOOK_TO
/* Not used. */
if ((flags & M_ICONV_HOOK_TO) && (tmp = mutt_charset_hook (tocode1)))
- mutt_canonical_charset (tocode1, sizeof (tocode1), tmp);
+ charset_canonicalize (tocode1, sizeof (tocode1), tmp);
#endif
- mutt_canonical_charset (fromcode1, sizeof (fromcode1), fromcode);
+ charset_canonicalize (fromcode1, sizeof (fromcode1), fromcode);
if ((flags & M_ICONV_HOOK_FROM) && (tmp = mutt_charset_hook (fromcode1)))
- mutt_canonical_charset (fromcode1, sizeof (fromcode1), tmp);
+ charset_canonicalize (fromcode1, sizeof (fromcode1), tmp);
if ((cd = iconv_open (tocode1, fromcode1)) != (iconv_t) - 1)
return cd;
const char **inrepls = NULL;
const char *outrepl = NULL;
- if (mutt_is_utf8 (to))
+ if (charset_is_utf8 (to))
outrepl = "\357\277\275";
- else if (mutt_is_utf8 (from))
+ else if (charset_is_utf8 (from))
inrepls = repls;
else
outrepl = "?";
fc->p = fc->ob = fc->bufo;
fc->ib = fc->bufi;
fc->ibl = 0;
- fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
+ fc->inrepls = charset_is_utf8 (to) ? repls : repls + 1;
}
else
fc = p_new(struct fgetconv_s, 1);
}
return -1;
}
-
-void mutt_set_charset (char *charset)
-{
- char buffer[STRING];
-
- mutt_canonical_charset (buffer, sizeof (buffer), charset);
- Charset_is_utf8 = !strcmp(buffer, "utf-8");
-
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
- bind_textdomain_codeset (PACKAGE, buffer);
-#endif
-}
-
-wchar_t replacement_char(void)
-{
- return Charset_is_utf8 ? 0xfffd : '?';
-}
projects / apps / madmutt.git / blobdiff