X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=14e79f41f0514c65e67be6e81209e339bef0ed1f;hp=0b2d979c2cdbdc4f4fa740468daf721294ba6ef4;hb=5e53f9e5f65aa5b3af6f5af9d868403536534afb;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/charset.c b/charset.c
index 0b2d979..14e79f4 100644
--- a/charset.c
+++ b/charset.c
@@ -24,6 +24,7 @@
 
 #include "mutt.h"
 #include "charset.h"
+#include "ascii.h"
 
 #include "lib/mem.h"
 #include "lib/intl.h"
@@ -43,8 +44,8 @@
  */
 
 static struct {
-  char *key;
-  char *pref;
+  const char *key;
+  const char *pref;
 } PreferredMIMENames[] = {
   {
   "ansi_x3.4-1968", "us-ascii"}, {
@@ -123,7 +124,7 @@ static struct {
   "latin6", "iso-8859-10"},     /* this is not a bug */
   {
   "l6", "iso-8859-10"}, {
-  "csISOLatin6" "iso-8859-10"}, {
+  "csISOLatin6", "iso-8859-10"}, {
   "csKOI8r", "koi8-r"}, {
   "MS_Kanji", "Shift_JIS"},     /* Note the underscore! */
   {
@@ -252,27 +253,6 @@ int mutt_chscmp (const char *s, const char *chs)
 }
 
 
-#ifndef HAVE_ICONV
-
-iconv_t iconv_open (const char *tocode, const char *fromcode)
-{
-  return (iconv_t) (-1);
-}
-
-size_t iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
-              char **outbuf, size_t * outbytesleft)
-{
-  return 0;
-}
-
-int iconv_close (iconv_t cd)
-{
-  return 0;
-}
-
-#endif /* !HAVE_ICONV */
-
-
 /*
  * Like iconv_open, but canonicalises the charsets
  */
@@ -314,32 +294,32 @@ 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, ICONV_CONST char **inbuf, size_t * inbytesleft,
+size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
                    char **outbuf, size_t * outbytesleft,
-                   ICONV_CONST char **inrepls, const char *outrepl)
+                   const char **inrepls, const char *outrepl)
 {
   size_t ret = 0, ret1;
-  ICONV_CONST char *ib = *inbuf;
+  const char *ib = *inbuf;
   size_t ibl = *inbytesleft;
   char *ob = *outbuf;
   size_t obl = *outbytesleft;
 
   for (;;) {
-    ret1 = iconv (cd, &ib, &ibl, &ob, &obl);
+    ret1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
     if (ret1 != (size_t) - 1)
       ret += ret1;
     if (ibl && obl && errno == EILSEQ) {
       if (inrepls) {
         /* Try replacing the input */
-        ICONV_CONST char **t;
+        const char **t;
 
         for (t = inrepls; *t; t++) {
-          ICONV_CONST char *ib1 = *t;
+          const char *ib1 = *t;
           size_t ibl1 = str_len (*t);
           char *ob1 = ob;
           size_t obl1 = obl;
 
-          iconv (cd, &ib1, &ibl1, &ob1, &obl1);
+          my_iconv(cd, &ib1, &ibl1, &ob1, &obl1);
           if (!ibl1) {
             ++ib, --ibl;
             ob = ob1, obl = obl1;
@@ -353,7 +333,7 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
       /* Replace the output */
       if (!outrepl)
         outrepl = "?";
-      iconv (cd, 0, 0, &ob, &obl);
+      my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
         int n = str_len (outrepl);
 
@@ -365,7 +345,7 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
         ++ib, --ibl;
         ob += n, obl -= n;
         ++ret;
-        iconv (cd, 0, 0, 0, 0); /* for good measure */
+        my_iconv(cd, 0, 0, 0, 0); /* for good measure */
         continue;
       }
     }
@@ -385,7 +365,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
                          int flags)
 {
   iconv_t cd;
-  ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+  const char *repls[] = { "\357\277\275", "?", 0 };
   char *s = *ps;
 
   if (!s || !*s)
@@ -393,11 +373,11 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
 
   if (to && from && (cd = mutt_iconv_open (to, from, flags)) != (iconv_t) - 1) {
     int len;
-    ICONV_CONST char *ib;
+    const char *ib;
     char *buf, *ob;
     size_t ibl, obl;
-    ICONV_CONST char **inrepls = 0;
-    char *outrepl = 0;
+    const char **inrepls = NULL;
+    const char *outrepl = NULL;
 
     if (mutt_is_utf8 (to))
       outrepl = "\357\277\275";
@@ -441,7 +421,7 @@ struct fgetconv_s {
   char *ob;
   char *ib;
   size_t ibl;
-  ICONV_CONST char **inrepls;
+  const char **inrepls;
 };
 
 struct fgetconv_not {
@@ -454,7 +434,7 @@ FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
 {
   struct fgetconv_s *fc;
   iconv_t cd = (iconv_t) - 1;
-  static ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+  static const char *repls[] = { "\357\277\275", "?", 0 };
 
   if (from && to)
     cd = mutt_iconv_open (to, from, flags);
@@ -511,7 +491,7 @@ int fgetconv (FGETCONV * _fc)
   if (fc->ibl) {
     size_t obl = sizeof (fc->bufo);
 
-    iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
+    my_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
     if (fc->p < fc->ob)
       return (unsigned char) *(fc->p)++;
   }
@@ -535,7 +515,7 @@ int fgetconv (FGETCONV * _fc)
   if (fc->ibl) {
     size_t obl = sizeof (fc->bufo);
 
-    mutt_iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob,
+    mutt_iconv (fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob,
                 &obl, fc->inrepls, 0);
     if (fc->p < fc->ob)
       return (unsigned char) *(fc->p)++;
@@ -555,7 +535,7 @@ void fgetconv_close (FGETCONV ** _fc)
   mem_free (_fc);
 }
 
-char *mutt_get_first_charset (const char *charset)
+const char *mutt_get_first_charset (const char *charset)
 {
   static char fcharset[SHORT_STRING];
   const char *c, *c1;
@@ -569,7 +549,7 @@ char *mutt_get_first_charset (const char *charset)
   return fcharset;
 }
 
-static size_t convert_string (ICONV_CONST char *f, size_t flen,
+static size_t convert_string (const char *f, size_t flen,
                               const char *from, const char *to,
                               char **t, size_t * tlen)
 {
@@ -583,8 +563,8 @@ static size_t convert_string (ICONV_CONST char *f, size_t flen,
     return (size_t) (-1);
   obl = 4 * flen + 1;
   ob = buf = mem_malloc (obl);
-  n = iconv (cd, &f, &flen, &ob, &obl);
-  if (n == (size_t) (-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+  n = my_iconv(cd, &f, &flen, &ob, &obl);
+  if (n == (size_t) (-1) || my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
     e = errno;
     mem_free (&buf);
     iconv_close (cd);
@@ -608,7 +588,7 @@ int mutt_convert_nonmime_string (char **ps)
 
   for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
     char *u = *ps;
-    char *s;
+    char *s = NULL;
     char *fromcode;
     size_t m, n;
     size_t ulen = str_len (*ps);