* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "charset.h"
* Unicode characters above U+FFFF are replaced by U+FFFE.
* If input data is invalid, return 0 and don't store anything.
*/
-static char *utf8_to_utf7 (const char *u8, size_t u8len, char **u7,
- size_t * u7len)
+static char *utf8_to_utf7 (const char *u8, ssize_t u8len, char **u7,
+ ssize_t * u7len)
{
char *buf, *p;
int ch;
void imap_utf7_encode (char **s)
{
- if (Charset) {
+ if (MCharset.charset) {
char *t = m_strdup(*s);
- if (!mutt_convert_string (&t, Charset, "UTF-8", 0)) {
+ if (!mutt_convert_string (&t, MCharset.charset, "utf-8", 0)) {
char *u7 = utf8_to_utf7 (t, strlen (t), NULL, 0);
p_delete(s);
*s = u7;
void imap_utf7_decode (char **s)
{
- if (Charset) {
+ if (MCharset.charset) {
char *t = utf7_to_utf8 (*s, m_strlen(*s), 0, 0);
- if (t && !mutt_convert_string (&t, "UTF-8", Charset, 0)) {
+ if (t && !mutt_convert_string (&t, "utf-8", MCharset.charset, 0)) {
p_delete(s);
*s = t;
}