X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=0652ffc807c6c27b15e684486438050e954b4377;hp=ba6b4227b61d68877be5298655917a9d7d99d560;hb=ac813896ca32d850febc2d95065ac4fa040f11f9;hpb=a8aba140a61d5b86093cea46afcb613092d4978d

diff --git a/charset.c b/charset.c
index ba6b422..0652ffc 100644
--- a/charset.c
+++ b/charset.c
@@ -35,6 +35,8 @@
 # define EILSEQ EINVAL
 #endif
 
+int Charset_is_utf8 = 0;
+
 /* 
  * The following list has been created manually from the data under:
  * http://www.isi.edu/in-notes/iana/assignments/character-sets
@@ -210,9 +212,9 @@ void mutt_set_langinfo_charset (void)
 
 #endif
 
-void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
+void mutt_canonical_charset (char *dest, ssize_t dlen, const char *name)
 {
-  size_t i;
+  ssize_t i;
   char *p;
   char scratch[LONG_STRING];
 
@@ -295,19 +297,19 @@ iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
  * if you're supplying an outrepl, the target charset should be.
  */
 
-size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
-                   char **outbuf, size_t * outbytesleft,
+ssize_t mutt_iconv(iconv_t cd, const char **inbuf, ssize_t *inbytesleft,
+                   char **outbuf, ssize_t *outbytesleft,
                    const char **inrepls, const char *outrepl)
 {
-  size_t ret = 0, ret1;
+  ssize_t ret = 0, ret1;
   const char *ib = *inbuf;
-  size_t ibl = *inbytesleft;
+  ssize_t ibl = *inbytesleft;
   char *ob = *outbuf;
-  size_t obl = *outbytesleft;
+  ssize_t obl = *outbytesleft;
 
   for (;;) {
     ret1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
-    if (ret1 != (size_t) - 1)
+    if (ret1 != -1)
       ret += ret1;
     if (ibl && obl && errno == EILSEQ) {
       if (inrepls) {
@@ -316,9 +318,9 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
 
         for (t = inrepls; *t; t++) {
           const char *ib1 = *t;
-          size_t ibl1 = m_strlen(*t);
+          ssize_t ibl1 = m_strlen(*t);
           char *ob1 = ob;
-          size_t obl1 = obl;
+          ssize_t obl1 = obl;
 
           my_iconv(cd, &ib1, &ibl1, &ob1, &obl1);
           if (!ibl1) {
@@ -336,7 +338,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
         outrepl = "?";
       my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
-        size_t n = m_strlen(outrepl);
+        ssize_t n = m_strlen(outrepl);
 
         if (n > obl) {
           outrepl = "?";
@@ -376,7 +378,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     int len;
     const char *ib;
     char *buf, *ob;
-    size_t ibl, obl;
+    ssize_t ibl, obl;
     const char **inrepls = NULL;
     const char *outrepl = NULL;
 
@@ -419,7 +421,7 @@ struct fgetconv_s {
   char *p;
   char *ob;
   char *ib;
-  size_t ibl;
+  ssize_t ibl;
   const char **inrepls;
 };
 
@@ -452,10 +454,10 @@ FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
   return (FGETCONV *) fc;
 }
 
-char *fgetconvs (char *buf, size_t l, FGETCONV * _fc)
+char *fgetconvs (char *buf, ssize_t l, FGETCONV * _fc)
 {
   int c;
-  size_t r;
+  ssize_t r;
 
   for (r = 0; r + 1 < l;) {
     if ((c = fgetconv (_fc)) == EOF)
@@ -488,7 +490,7 @@ int fgetconv (FGETCONV * _fc)
   /* Try to convert some more */
   fc->p = fc->ob = fc->bufo;
   if (fc->ibl) {
-    size_t obl = sizeof (fc->bufo);
+    ssize_t obl = ssizeof(fc->bufo);
 
     my_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
     if (fc->p < fc->ob)
@@ -512,7 +514,7 @@ int fgetconv (FGETCONV * _fc)
 
   /* Try harder this time to convert some */
   if (fc->ibl) {
-    size_t obl = sizeof (fc->bufo);
+    ssize_t obl = ssizeof(fc->bufo);
 
     mutt_iconv (fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob,
                 &obl, fc->inrepls, 0);
@@ -548,19 +550,19 @@ const char *mutt_get_first_charset (const char *charset)
   return fcharset;
 }
 
-static size_t convert_string (const char *f, size_t flen,
+static ssize_t convert_string (const char *f, ssize_t flen,
                               const char *from, const char *to,
-                              char **t, size_t * tlen)
+                              char **t, ssize_t * tlen)
 {
   iconv_t cd;
   char *buf, *ob;
-  size_t obl;
+  ssize_t obl;
   ssize_t n;
   int e;
 
   cd = mutt_iconv_open (to, from, 0);
   if (cd == (iconv_t) (-1))
-    return (size_t) (-1);
+    return -1;
   obl = 4 * flen + 1;
   ob = buf = xmalloc(obl);
   n = my_iconv(cd, &f, &flen, &ob, &obl);
@@ -569,7 +571,7 @@ static size_t convert_string (const char *f, size_t flen,
     p_delete(&buf);
     iconv_close (cd);
     errno = e;
-    return (size_t) (-1);
+    return -1;
   }
   *ob = '\0';
 
@@ -590,9 +592,9 @@ int mutt_convert_nonmime_string (char **ps)
     char *u = *ps;
     char *s = NULL;
     char *fromcode;
-    size_t m, n;
-    size_t ulen = m_strlen(*ps);
-    size_t slen;
+    ssize_t m, n;
+    ssize_t ulen = m_strlen(*ps);
+    ssize_t slen;
 
     if (!u || !*u)
       return 0;
@@ -604,7 +606,7 @@ int mutt_convert_nonmime_string (char **ps)
     fromcode = p_dupstr(c, n);
     m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
     p_delete(&fromcode);
-    if (m != (size_t) (-1)) {
+    if (m != -1) {
       p_delete(ps);
       *ps = s;
       return 0;
@@ -612,3 +614,23 @@ int mutt_convert_nonmime_string (char **ps)
   }
   return -1;
 }
+
+void mutt_set_charset (char *charset)
+{
+    char buffer[STRING];
+
+    mutt_canonical_charset (buffer, sizeof (buffer), charset);
+
+    Charset_is_utf8 = 0;
+    if (!strcmp (buffer, "utf-8"))
+        Charset_is_utf8 = 1;
+
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+    bind_textdomain_codeset (PACKAGE, buffer);
+#endif
+}
+
+wchar_t replacement_char (void)
+{
+    return Charset_is_utf8 ? 0xfffd : '?';
+}