#include <errno.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "charset.h"
-#include "ascii.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#ifndef EILSEQ
# define EILSEQ EINVAL
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
- if (!(Charset = str_dup (buff2)))
- Charset = str_dup ("iso-8859-1");
+ if (!(Charset = m_strdup(buff2)))
+ Charset = m_strdup("iso-8859-1");
}
#else
void mutt_set_langinfo_charset (void)
{
- Charset = str_dup ("iso-8859-1");
+ Charset = m_strdup("iso-8859-1");
}
#endif
for (t = inrepls; *t; t++) {
const char *ib1 = *t;
- size_t ibl1 = str_len (*t);
+ size_t ibl1 = m_strlen(*t);
char *ob1 = ob;
size_t obl1 = obl;
outrepl = "?";
my_iconv(cd, 0, 0, &ob, &obl);
if (obl) {
- int n = str_len (outrepl);
+ int n = m_strlen(outrepl);
if (n > obl) {
outrepl = "?";
else
outrepl = "?";
- len = str_len (s);
+ len = m_strlen(s);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
ob = buf = xmalloc(obl + 1);
const char *c, *c1;
c = charset;
- if (!str_len (c))
+ if (!m_strlen(c))
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
char *s = NULL;
char *fromcode;
size_t m, n;
- size_t ulen = str_len (*ps);
+ size_t ulen = m_strlen(*ps);
size_t slen;
if (!u || !*u)
return 0;
c1 = strchr (c, ':');
- n = c1 ? c1 - c : str_len (c);
+ n = c1 ? c1 - c : m_strlen(c);
if (!n)
continue;
fromcode = p_dupstr(c, n);