X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=5b1aa658979ebf9493aed9d3e74486c6c8107d10;hp=738cd7361fe223889e8611bbc92e2eaf6d873302;hb=8f75834aeadb902879602a82a259f4d3bf9c569c;hpb=10e80e482eff3762b0b8d41b0c7795b76704479c

diff --git a/charset.h b/charset.h
index 738cd73..5b1aa65 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 <roessler@does-not-exist.org>
@@ -11,54 +29,67 @@
 #define _CHARSET_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#  include "config.h"
 #endif
 
-#include "mutt.h"
+#include <lib-lua/lib-lua.h>
+#include "charset.li"
+
+/****************************************************************************/
+/* charset functions                                                        */
+/****************************************************************************/
+
+extern int Charset_is_utf8;
+extern wchar_t CharsetReplacement;
+
+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 *);
+
+
+/****************************************************************************/
+/* iconv-line functions                                                     */
+/****************************************************************************/
+
+#define MUTT_ICONV_ERROR  ((iconv_t)(-1))
 
 #ifdef HAVE_ICONV_H
-#include <iconv.h>
-#endif
+#  include <iconv.h>
 
-#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
-#  define iconv_open(a, b)     ((iconv_t)(-1))
+#else
+#  define iconv_t              void*
+#  define iconv_open(a, b)     MUTT_ICONV_ERROR
 #  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
 
-int mutt_convert_string (char **, const char *, const char *, int);
-const char *mutt_get_first_charset (const char *);
-int mutt_convert_nonmime_string (char **);
+#define M_ICONV_HOOK_FROM 1
+#define M_ICONV_HOOK_TO   2
 
-iconv_t mutt_iconv_open (const char *, const char *, int);
-size_t mutt_iconv (iconv_t, const char **, size_t *, char **, size_t *,
+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;
+int mutt_convert_string(char **, const char *, const char *, int);
+int mutt_convert_nonmime_string (char **);
 
-FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
-int fgetconv (FGETCONV *);
-char *fgetconvs (char *, size_t, FGETCONV *);
-void fgetconv_close (FGETCONV **);
 
-void mutt_set_langinfo_charset (void);
+/****************************************************************************/
+/* fgetconv functions                                                       */
+/****************************************************************************/
 
-#define M_ICONV_HOOK_FROM 1
-#define M_ICONV_HOOK_TO   2
+typedef struct fgetconv_t fgetconv_t;
 
-extern int Charset_is_utf8;
+fgetconv_t *fgetconv_open(FILE *, const char *, const char *, int);
+void fgetconv_close(fgetconv_t **);
 
-void mutt_set_charset(char *charset);
-wchar_t replacement_char(void);
+int fgetconv(fgetconv_t *);
+char *fgetconvs(char *, ssize_t, fgetconv_t *);
 
 #endif /* _CHARSET_H */