X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=702f8f1c9707b1187d0589a3c6ddf215daded5e1;hp=9cbd2bd4eea2e898c5b82613df06449e897dd37f;hb=2c56b665394c80195b976537e608b690947fcb14;hpb=5e53f9e5f65aa5b3af6f5af9d868403536534afb

diff --git a/charset.h b/charset.h
index 9cbd2bd..702f8f1 100644
--- a/charset.h
+++ b/charset.h
@@ -10,44 +10,54 @@
 #ifndef _CHARSET_H
 #define _CHARSET_H
 
-#ifdef HAVE_ICONV_H
-#include <iconv.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
 #endif
 
-#ifndef HAVE_ICONV_T_DEF
-typedef void *iconv_t;
-#endif
 
-#ifndef HAVE_ICONV
+#define M_ICONV_HOOK_FROM 1
+#define M_ICONV_HOOK_TO   2
+
+extern char *Charset;
+extern int Charset_is_utf8;
+
+#ifdef HAVE_ICONV_H
+#  include <iconv.h>
+
+static inline ssize_t
+my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) {
+    return iconv(ict, (char **)in, (size_t*)il, out, (size_t*)ol);
+}
+
+#else
+#  define iconv_t              void*
 #  define iconv_open(a, b)     ((iconv_t)(-1))
 #  define my_iconv(a,b,c,d,e)  0
 #  define iconv_close(a)       0
-#else
-static inline size_t my_iconv(iconv_t ict, const char **inbuf, size_t *ilen,
-                              char **outbuf, size_t *olen)
-{
-    return iconv(ict, (char **)inbuf, ilen, outbuf, olen);
-}
 #endif
 
+void mutt_set_langinfo_charset (void);
+void mutt_canonical_charset(char *, ssize_t, const char *);
+
+int mutt_is_utf8(const char *s);
+int mutt_is_us_ascii(const char *s);
+
 int mutt_convert_string (char **, const char *, const char *, int);
 const char *mutt_get_first_charset (const char *);
 int mutt_convert_nonmime_string (char **);
 
 iconv_t mutt_iconv_open (const char *, const char *, int);
-size_t mutt_iconv (iconv_t, const char **, size_t *, char **, size_t *,
-                   const char **, const char *);
+ssize_t mutt_iconv (iconv_t, const char **, ssize_t *, char **, ssize_t *,
+                    const char **, const char *);
 
 typedef void *FGETCONV;
 
 FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
 int fgetconv (FGETCONV *);
-char *fgetconvs (char *, size_t, FGETCONV *);
+char *fgetconvs (char *, ssize_t, FGETCONV *);
 void fgetconv_close (FGETCONV **);
 
-void mutt_set_langinfo_charset (void);
-
-#define M_ICONV_HOOK_FROM 1
-#define M_ICONV_HOOK_TO   2
+void mutt_set_charset(char *charset);
+wchar_t replacement_char(void);
 
 #endif /* _CHARSET_H */