X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=3b7566dac151a84ed114a0106f6c7b1cef3929b5;hp=b27a5c6c9aad71ca8c26750704bf17a2c80cf167;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=d6e1782b1e788bd1c4767443712bf1713cc013ef diff --git a/charset.h b/charset.h index b27a5c6..3b7566d 100644 --- a/charset.h +++ b/charset.h @@ -1,3 +1,21 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * Copyright © 2006 Pierre Habouzit + */ /* * Copyright notice from original mutt: * Copyright (C) 1999-2000 Thomas Roessler @@ -14,49 +32,56 @@ # include "config.h" #endif +#include +#include "charset.li" -#define M_ICONV_HOOK_FROM 1 -#define M_ICONV_HOOK_TO 2 +/****************************************************************************/ +/* charset functions */ +/****************************************************************************/ -extern char *Charset; extern int Charset_is_utf8; +extern wchar_t CharsetReplacement; -void charset_initialize(void); -void mutt_canonical_charset(char *, ssize_t, const char *); +void charset_canonicalize(char *, ssize_t, const char *); +int charset_is_utf8(const char *); +int charset_is_us_ascii(const char *); +const char *charset_getfirst(const char *); -int charset_is_utf8(const char *s); -int charset_is_us_ascii(const char *s); -#ifdef HAVE_ICONV_H -# include +/****************************************************************************/ +/* iconv-line functions */ +/****************************************************************************/ + +#define MUTT_ICONV_ERROR ((iconv_t)(-1)) + +#include 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 -#endif +#define M_ICONV_HOOK_FROM 1 +#define M_ICONV_HOOK_TO 2 + +iconv_t mutt_iconv_open(const char *, const char *, int); +ssize_t mutt_iconv(iconv_t, const char **, ssize_t *, char **, ssize_t *, + const char **, const char *); -int mutt_convert_string (char **, const char *, const char *, int); -const char *mutt_get_first_charset (const char *); +int mutt_convert_string(char **, const char *, const char *, int); int mutt_convert_nonmime_string (char **); -iconv_t mutt_iconv_open (const char *, const char *, int); -ssize_t mutt_iconv (iconv_t, const char **, ssize_t *, char **, ssize_t *, - const char **, const char *); -typedef void *FGETCONV; +/****************************************************************************/ +/* fgetconv functions */ +/****************************************************************************/ + +typedef struct fgetconv_t fgetconv_t; -FGETCONV *fgetconv_open (FILE *, const char *, const char *, int); -int fgetconv (FGETCONV *); -char *fgetconvs (char *, ssize_t, FGETCONV *); -void fgetconv_close (FGETCONV **); +fgetconv_t *fgetconv_open(FILE *, const char *, const char *, int); +void fgetconv_close(fgetconv_t **); -wchar_t replacement_char(void); +int fgetconv(fgetconv_t *); +char *fgetconvs(char *, ssize_t, fgetconv_t *); #endif /* _CHARSET_H */