projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix empty inline GPG messages: Enable LFS so that madmutt can communicate
[apps/madmutt.git]
/
charset.cpkg
diff --git
a/charset.cpkg
b/charset.cpkg
index
42eba4d
..
89905b8
100644
(file)
--- a/
charset.cpkg
+++ b/
charset.cpkg
@@
-27,7
+27,7
@@
#include <lib-lib/lib-lib.h>
#include <lib-lib/lib-lib.h>
-#ifdef HAVE_LANGINFO_
CODESET
+#ifdef HAVE_LANGINFO_
H
# include <langinfo.h>
#endif
# include <langinfo.h>
#endif
@@
-47,7
+47,7
@@
static rx_t *iconv_hooks = NULL;
static char *charset_init(void)
{
const char *res = "iso-8859-1";
static char *charset_init(void)
{
const char *res = "iso-8859-1";
-#ifdef HAVE_LANGINFO_
CODESET
+#ifdef HAVE_LANGINFO_
H
char buff[STRING];
char buff2[STRING];
char buff[STRING];
char buff2[STRING];
@@
-59,9
+59,7
@@
static char *charset_init(void)
res = buff2;
}
#endif
res = buff2;
}
#endif
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset(PACKAGE, res);
bind_textdomain_codeset(PACKAGE, res);
-#endif
return m_strdup(res);
}
return m_strdup(res);
}
@@
-71,7
+69,7
@@
static void charset_onchange(const char *cset)
CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
}
CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
}
-@package
MChar
set {
+@package
mod_c
set {
/*
** .pp
** This variable is a colon-separated list of character encoding
/*
** .pp
** This variable is a colon-separated list of character encoding
@@
-128,13
+126,13
@@
static void charset_onchange(const char *cset)
void charset_hook(rx_t local, const string_t alias) {
rx_set_template(local, alias);
void charset_hook(rx_t local, const string_t alias) {
rx_set_template(local, alias);
- rx_list_a
ppend(&charset_hooks,
local);
+ rx_list_a
dd2(&charset_hooks, &
local);
RETURN();
};
void iconv_hook(rx_t local, const string_t alias) {
rx_set_template(local, alias);
RETURN();
};
void iconv_hook(rx_t local, const string_t alias) {
rx_set_template(local, alias);
- rx_list_a
ppend(&iconv_hooks,
local);
+ rx_list_a
dd2(&iconv_hooks, &
local);
RETURN();
};
};
RETURN();
};
};
@@
-385,7
+383,7
@@
static ssize_t convert_string(const char *f, ssize_t flen,
int mutt_convert_nonmime_string(char **ps)
{
int mutt_convert_nonmime_string(char **ps)
{
- const char *p =
MChar
set.assumed_charset;
+ const char *p =
mod_c
set.assumed_charset;
ssize_t ulen = m_strlen(*ps);
char *u = *ps;
ssize_t ulen = m_strlen(*ps);
char *u = *ps;
@@
-404,7
+402,7
@@
int mutt_convert_nonmime_string(char **ps)
m_strncpy(fromcode, sizeof(fromcode), p, q - p);
p = q;
m_strncpy(fromcode, sizeof(fromcode), p, q - p);
p = q;
- if (convert_string(u, ulen, fromcode,
MChar
set.charset, &s, &slen) >= 0) {
+ if (convert_string(u, ulen, fromcode,
mod_c
set.charset, &s, &slen) >= 0) {
p_delete(ps);
*ps = s;
return 0;
p_delete(ps);
*ps = s;
return 0;