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

diff --git a/charset.h b/charset.h
index 2721b01..702f8f1 100644
--- a/charset.h
+++ b/charset.h
@@ -1,57 +1,63 @@
 /*
+ * Copyright notice from original mutt:
  * 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.
- *
- *     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
 
-#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);
+#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
 #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);
-char *mutt_get_first_charset (const char *);
+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, ICONV_CONST char **, size_t *, char **, size_t *,
-                   ICONV_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 */