#include "mutt.h"
#include "charset.h"
+#include "ascii.h"
#include "lib/mem.h"
#include "lib/intl.h"
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
- if (!(Charset = safe_strdup (buff2)))
- Charset = safe_strdup ("iso-8859-1");
+ if (!(Charset = str_dup (buff2)))
+ Charset = str_dup ("iso-8859-1");
}
#else
void mutt_set_langinfo_charset (void)
{
- Charset = safe_strdup ("iso-8859-1");
+ Charset = str_dup ("iso-8859-1");
}
#endif
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
- !mutt_strcasecmp (scratch, PreferredMIMENames[i].key)) {
+ !str_casecmp (scratch, PreferredMIMENames[i].key)) {
strfcpy (dest, PreferredMIMENames[i].pref, dlen);
return;
}
for (t = inrepls; *t; t++) {
ICONV_CONST char *ib1 = *t;
- size_t ibl1 = mutt_strlen (*t);
+ size_t ibl1 = str_len (*t);
char *ob1 = ob;
size_t obl1 = obl;
outrepl = "?";
iconv (cd, 0, 0, &ob, &obl);
if (obl) {
- int n = mutt_strlen (outrepl);
+ int n = str_len (outrepl);
if (n > obl) {
outrepl = "?";
else
outrepl = "?";
- len = mutt_strlen (s);
+ len = str_len (s);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
- ob = buf = safe_malloc (obl + 1);
+ ob = buf = mem_malloc (obl + 1);
mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
iconv_close (cd);
*ob = '\0';
- FREE (ps);
+ mem_free (ps);
*ps = buf;
- mutt_str_adjust (ps);
+ str_adjust (ps);
return 0;
}
else
cd = mutt_iconv_open (to, from, flags);
if (cd != (iconv_t) - 1) {
- fc = safe_malloc (sizeof (struct fgetconv_s));
+ fc = mem_malloc (sizeof (struct fgetconv_s));
fc->p = fc->ob = fc->bufo;
fc->ib = fc->bufi;
fc->ibl = 0;
fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
}
else
- fc = safe_malloc (sizeof (struct fgetconv_not));
+ fc = mem_malloc (sizeof (struct fgetconv_not));
fc->file = file;
fc->cd = cd;
return (FGETCONV *) fc;
if (fc->cd != (iconv_t) - 1)
iconv_close (fc->cd);
- FREE (_fc);
+ mem_free (_fc);
}
char *mutt_get_first_charset (const char *charset)
const char *c, *c1;
c = charset;
- if (!mutt_strlen (c))
+ if (!str_len (c))
return "us-ascii";
if (!(c1 = strchr (c, ':')))
- return charset;
+ return ((char*) charset);
strfcpy (fcharset, c, c1 - c + 1);
return fcharset;
}
if (cd == (iconv_t) (-1))
return (size_t) (-1);
obl = 4 * flen + 1;
- ob = buf = safe_malloc (obl);
+ 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)) {
e = errno;
- FREE (&buf);
+ mem_free (&buf);
iconv_close (cd);
errno = e;
return (size_t) (-1);
*tlen = ob - buf;
- safe_realloc (&buf, ob - buf + 1);
+ mem_realloc (&buf, ob - buf + 1);
*t = buf;
iconv_close (cd);
for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
char *u = *ps;
- char *s;
+ char *s = NULL;
char *fromcode;
size_t m, n;
- size_t ulen = mutt_strlen (*ps);
+ size_t ulen = str_len (*ps);
size_t slen;
if (!u || !*u)
return 0;
c1 = strchr (c, ':');
- n = c1 ? c1 - c : mutt_strlen (c);
+ n = c1 ? c1 - c : str_len (c);
if (!n)
continue;
- fromcode = safe_malloc (n + 1);
+ fromcode = mem_malloc (n + 1);
strfcpy (fromcode, c, n + 1);
m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
- FREE (&fromcode);
+ mem_free (&fromcode);
if (m != (size_t) (-1)) {
- FREE (ps);
+ mem_free (ps);
*ps = s;
return 0;
}