#include <unistd.h>
#include <errno.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "charset.h"
#include "ascii.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#ifndef EILSEQ
"latin6", "iso-8859-10"}, /* this is not a bug */
{
"l6", "iso-8859-10"}, {
- "csISOLatin6" "iso-8859-10"}, {
+ "csISOLatin6", "iso-8859-10"}, {
"csKOI8r", "koi8-r"}, {
"MS_Kanji", "Shift_JIS"}, /* Note the underscore! */
{
}
-#ifndef HAVE_ICONV
-
-iconv_t iconv_open (const char *tocode, const char *fromcode)
-{
- return (iconv_t) (-1);
-}
-
-size_t iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
- char **outbuf, size_t * outbytesleft)
-{
- return 0;
-}
-
-int iconv_close (iconv_t cd)
-{
- return 0;
-}
-
-#endif /* !HAVE_ICONV */
-
-
/*
* Like iconv_open, but canonicalises the charsets
*/
* if you're supplying an outrepl, the target charset should be.
*/
-size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
+size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
char **outbuf, size_t * outbytesleft,
- ICONV_CONST char **inrepls, const char *outrepl)
+ const char **inrepls, const char *outrepl)
{
size_t ret = 0, ret1;
- ICONV_CONST char *ib = *inbuf;
+ const char *ib = *inbuf;
size_t ibl = *inbytesleft;
char *ob = *outbuf;
size_t obl = *outbytesleft;
for (;;) {
- ret1 = iconv (cd, &ib, &ibl, &ob, &obl);
+ ret1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
if (ret1 != (size_t) - 1)
ret += ret1;
if (ibl && obl && errno == EILSEQ) {
if (inrepls) {
/* Try replacing the input */
- ICONV_CONST char **t;
+ const char **t;
for (t = inrepls; *t; t++) {
- ICONV_CONST char *ib1 = *t;
+ const char *ib1 = *t;
size_t ibl1 = str_len (*t);
char *ob1 = ob;
size_t obl1 = obl;
- iconv (cd, &ib1, &ibl1, &ob1, &obl1);
+ my_iconv(cd, &ib1, &ibl1, &ob1, &obl1);
if (!ibl1) {
++ib, --ibl;
ob = ob1, obl = obl1;
/* Replace the output */
if (!outrepl)
outrepl = "?";
- iconv (cd, 0, 0, &ob, &obl);
+ my_iconv(cd, 0, 0, &ob, &obl);
if (obl) {
int n = str_len (outrepl);
++ib, --ibl;
ob += n, obl -= n;
++ret;
- iconv (cd, 0, 0, 0, 0); /* for good measure */
+ my_iconv(cd, 0, 0, 0, 0); /* for good measure */
continue;
}
}
int flags)
{
iconv_t cd;
- ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+ const char *repls[] = { "\357\277\275", "?", 0 };
char *s = *ps;
if (!s || !*s)
if (to && from && (cd = mutt_iconv_open (to, from, flags)) != (iconv_t) - 1) {
int len;
- ICONV_CONST char *ib;
+ const char *ib;
char *buf, *ob;
size_t ibl, obl;
- ICONV_CONST char **inrepls = 0;
- char *outrepl = 0;
+ const char **inrepls = NULL;
+ const char *outrepl = NULL;
if (mutt_is_utf8 (to))
outrepl = "\357\277\275";
len = str_len (s);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
- ob = buf = mem_malloc (obl + 1);
+ ob = buf = xmalloc(obl + 1);
mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
iconv_close (cd);
*ob = '\0';
- mem_free (ps);
+ p_delete(ps);
*ps = buf;
str_adjust (ps);
char *ob;
char *ib;
size_t ibl;
- ICONV_CONST char **inrepls;
+ const char **inrepls;
};
struct fgetconv_not {
{
struct fgetconv_s *fc;
iconv_t cd = (iconv_t) - 1;
- static ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+ static const char *repls[] = { "\357\277\275", "?", 0 };
if (from && to)
cd = mutt_iconv_open (to, from, flags);
if (cd != (iconv_t) - 1) {
- fc = mem_malloc (sizeof (struct fgetconv_s));
+ fc = p_new(struct fgetconv_s, 1);
fc->p = fc->ob = fc->bufo;
fc->ib = fc->bufi;
fc->ibl = 0;
fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
}
else
- fc = mem_malloc (sizeof (struct fgetconv_not));
+ fc = p_new(struct fgetconv_not, 1);
fc->file = file;
fc->cd = cd;
return (FGETCONV *) fc;
if (fc->ibl) {
size_t obl = sizeof (fc->bufo);
- iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
+ my_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
if (fc->p < fc->ob)
return (unsigned char) *(fc->p)++;
}
if (fc->ibl) {
size_t obl = sizeof (fc->bufo);
- mutt_iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob,
+ mutt_iconv (fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob,
&obl, fc->inrepls, 0);
if (fc->p < fc->ob)
return (unsigned char) *(fc->p)++;
if (fc->cd != (iconv_t) - 1)
iconv_close (fc->cd);
- mem_free (_fc);
+ p_delete(_fc);
}
-char *mutt_get_first_charset (const char *charset)
+const char *mutt_get_first_charset (const char *charset)
{
static char fcharset[SHORT_STRING];
const char *c, *c1;
return fcharset;
}
-static size_t convert_string (ICONV_CONST char *f, size_t flen,
+static size_t convert_string (const char *f, size_t flen,
const char *from, const char *to,
char **t, size_t * tlen)
{
if (cd == (iconv_t) (-1))
return (size_t) (-1);
obl = 4 * flen + 1;
- ob = buf = mem_malloc (obl);
- n = iconv (cd, &f, &flen, &ob, &obl);
- if (n == (size_t) (-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+ ob = buf = xmalloc(obl);
+ n = my_iconv(cd, &f, &flen, &ob, &obl);
+ if (n == (size_t) (-1) || my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
e = errno;
- mem_free (&buf);
+ p_delete(&buf);
iconv_close (cd);
errno = e;
return (size_t) (-1);
*tlen = ob - buf;
- mem_realloc (&buf, ob - buf + 1);
+ p_realloc(&buf, ob - buf + 1);
*t = buf;
iconv_close (cd);
n = c1 ? c1 - c : str_len (c);
if (!n)
continue;
- fromcode = mem_malloc (n + 1);
- strfcpy (fromcode, c, n + 1);
+ fromcode = p_dupstr(c, n);
m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
- mem_free (&fromcode);
+ p_delete(&fromcode);
if (m != (size_t) (-1)) {
- mem_free (ps);
+ p_delete(ps);
*ps = s;
return 0;
}
projects / apps / madmutt.git / blobdiff