char buff[LONG_STRING];
char buff2[LONG_STRING];
- strfcpy (buff, nl_langinfo (CODESET), sizeof (buff));
+ m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET));
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
else if (!ascii_strncasecmp (name, "iso8859-", 8))
snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
else
- strfcpy (scratch, NONULL (name), sizeof (scratch));
+ m_strcpy(scratch, sizeof(scratch), NONULL(name));
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
- !str_casecmp (scratch, PreferredMIMENames[i].key)) {
- strfcpy (dest, PreferredMIMENames[i].pref, dlen);
+ !m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
+ m_strcpy(dest, dlen, PreferredMIMENames[i].pref);
return;
}
- strfcpy (dest, scratch, dlen);
+ m_strcpy(dest, dlen, scratch);
/* for cosmetics' sake, transform to lowercase. */
for (p = dest; *p; p++)
outrepl = "?";
my_iconv(cd, 0, 0, &ob, &obl);
if (obl) {
- int n = m_strlen(outrepl);
+ size_t n = m_strlen(outrepl);
if (n > obl) {
outrepl = "?";
p_delete(ps);
*ps = buf;
-
- str_adjust (ps);
return 0;
}
else
fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
}
else
- fc = p_new(struct fgetconv_not, 1);
+ fc = p_new(struct fgetconv_s, 1);
fc->file = file;
fc->cd = cd;
return (FGETCONV *) fc;
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
- strfcpy (fcharset, c, c1 - c + 1);
+ m_strcpy(fcharset, c1 - c + 1, c);
return fcharset;
}
{
iconv_t cd;
char *buf, *ob;
- size_t obl, n;
+ size_t obl;
+ ssize_t n;
int e;
cd = mutt_iconv_open (to, from, 0);
obl = 4 * flen + 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)) {
+ if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) {
e = errno;
p_delete(&buf);
iconv_close (cd);