X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=2f03c24bcfd69d4ab8115a1eadeb009997d390cb;hp=6397493d94a0c6d45812775e4b10b24397e61e85;hb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd;hpb=fc9c62aae0a7ebf1ff9335e322e7c1f5d3e459d3

diff --git a/charset.h b/charset.h
index 6397493..2f03c24 100644
--- a/charset.h
+++ b/charset.h
@@ -1,56 +1,95 @@
 /*
- * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
+ *  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.
  *
- *     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.
+ *  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.
  *
- *     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.
+ *  Copyright © 2006 Pierre Habouzit
+ */
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
  *
- *     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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #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
+/****************************************************************************/
+/* charset functions                                                        */
+/****************************************************************************/
 
-#ifndef HAVE_ICONV
-#define ICONV_CONST /**/
-iconv_t iconv_open (const char *, const char *);
-size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
-int iconv_close (iconv_t);
-#endif
+extern char *Charset;
+extern int Charset_is_utf8;
+extern wchar_t CharsetReplacement;
+
+void charset_initialize(void);
+void charset_canonicalize(char *, ssize_t, const char *);
+int charset_is_utf8(const char *s);
+int charset_is_us_ascii(const char *s);
+
+const char *charset_getfirst(const char *);
 
-int mutt_convert_string (char **, const char *, const char *, int);
-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, ICONV_CONST char **, size_t *, char **, size_t *, ICONV_CONST char **, const char *);
+/****************************************************************************/
+/* iconv-line functions                                                     */
+/****************************************************************************/
 
-typedef void * FGETCONV;
+#define MUTT_ICONV_ERROR  ((iconv_t)(-1))
 
-FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
-int fgetconv (FGETCONV *);
-char * fgetconvs (char *, size_t, FGETCONV *);
-void fgetconv_close (FGETCONV **);
+#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);
+}
 
-void mutt_set_langinfo_charset (void);
+#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
+#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);
+int mutt_convert_nonmime_string (char **);
+
+
+/****************************************************************************/
+/* fgetconv functions                                                       */
+/****************************************************************************/
+
+typedef struct fgetconv_t fgetconv_t;
+
+fgetconv_t *fgetconv_open(FILE *, const char *, const char *, int);
+void fgetconv_close(fgetconv_t **);
+
+int fgetconv(fgetconv_t *);
+char *fgetconvs(char *, ssize_t, fgetconv_t *);
+
 #endif /* _CHARSET_H */