workaround a stupid issue in how decoding is performed in mutt *sigh*

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index 1f15e17..5e5faf0 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -566,7 +566,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
     /* Convert to UTF-8 */
     ib = bufi;
     ob = bufu, obl = sizeof (bufu);
-    n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
+    n = mutt_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
     if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
       ret = -1;
       break;
@@ -578,7 +578,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
       if (cd[i] != MUTT_ICONV_ERROR && score[i] != -1) {
         ub = bufu, ubl = ubl1;
         ob = bufo, obl = sizeof (bufo);
-        n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
+        n = mutt_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
         if (n == -1) {
           score[i] = -1;
         }
@@ -627,9 +627,9 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
 
   for (i = 0; i < ncodes; i++)
     if (cd[i] != MUTT_ICONV_ERROR)
-      iconv_close (cd[i]);
+      iconv_close(cd[i]);
 
-  iconv_close (cd1);
+  iconv_close(cd1);
   p_delete(&cd);
   p_delete(&infos);
   p_delete(&score);