X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=702f8f1c9707b1187d0589a3c6ddf215daded5e1;hp=fd85199bb41580211b7f27c7ba8bcdd604655418;hb=2c3617ad2d8a2ad98b573cc34483d1cb7cd451f5;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9 diff --git a/charset.h b/charset.h index fd85199..702f8f1 100644 --- a/charset.h +++ b/charset.h @@ -11,31 +11,37 @@ #define _CHARSET_H #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif -#include "mutt.h" + +#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 -#endif +# include -#ifndef HAVE_ICONV_T_DEF -typedef void *iconv_t; -#endif +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); +} -#ifndef HAVE_ICONV +#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 ssize_t my_iconv(iconv_t ict, const char **inbuf, ssize_t *ilen, - char **outbuf, ssize_t *olen) -{ - return iconv(ict, (char **)inbuf, (size_t*)ilen, outbuf, (size_t*)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 **); @@ -51,13 +57,6 @@ int fgetconv (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 - -extern int Charset_is_utf8; - void mutt_set_charset(char *charset); wchar_t replacement_char(void);